mastodon/app/views/about
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
_login.html.haml Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
_registration.html.haml Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +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