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

4.0 KiB

Raw Blame History

View Raw