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
..
2018-12-22 20:02:09 +01:00
2018-12-06 17:36:11 +01:00
2017-11-24 02:05:53 +01:00
2019-03-03 15:38:47 +01:00
2019-02-02 19:11:38 +01:00
2017-12-01 16:40:02 +01:00
2018-06-29 15:34:36 +02:00
2017-11-18 00:16:48 +01:00
2019-02-02 12:25:04 +01:00
2019-03-17 15:34:56 +01:00
2017-01-13 03:24:41 +01:00