Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
..
2018-12-06 17:36:11 +01:00
2017-11-17 19:29:16 -08:00