Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.

2018-10-29 14:00:41 +01:00

6.6 KiB

Raw Blame History

View Raw