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
_features.html.haml
_forms.html.haml
_links.html.haml
_registration.html.haml
more.html.haml
show.html.haml	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
terms.html.haml