David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		2018-04-18 18:48:12 -05:00
..
_administration.html.haml	Fix missing "Administered by" when timeline preview disabled (#7161)	2018-04-17 13:51:14 +02:00
_contact.html.haml	Do not create empty a element when there is no e-mail (#4455)	2017-07-30 16:24:18 +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' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
show.html.haml	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
terms.html.haml	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00