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

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00

_registration.html.haml

Don't autofocus registration form (#10356)

2019-03-24 05:00:02 +01:00

more.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-16 14:14:20 +01:00

show.html.haml

Do not show timeline preview or directory widgets if they are disabled (#10284)

2019-03-19 05:48:17 +01:00

terms.html.haml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00