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-10-09 03:02:52 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00