Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
_login.html.haml	…
_registration.html.haml	…
more.html.haml	…
show.html.haml	…
terms.html.haml	…