Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
2018-10-07 23:44:58 +02:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00