mastodon-glitch/app/views/about
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
_login.html.haml Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
_registration.html.haml Add "why do you want to join" field to invite requests (#10524) 2019-04-09 23:06:30 +09: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