Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
..
2019-03-29 22:06:16 +09:00
2019-03-29 22:04:55 +09:00
2017-11-20 22:13:37 -08:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00