Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
_features.html.haml	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
_forms.html.haml	Improve styling of closed registrations message, rename button (#6695)	2018-03-08 11:10:37 +01:00
_links.html.haml	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
_registration.html.haml	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00