You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
_administration.html.haml	Fix missing "Administered by" when timeline preview disabled (#7161)	7 years ago
_contact.html.haml	Do not create empty a element when there is no e-mail (#4455)	7 years ago
_features.html.haml	Redesign the landing page, mount public timeline on it (#4122)	7 years ago
_forms.html.haml	Improve styling of closed registrations message, rename button (#6695)	7 years ago
_links.html.haml	Redesign landing page (again) (#6486)	7 years ago
_registration.html.haml	Redesign landing page (again) (#6486)	7 years ago
more.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
show.html.haml	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
terms.html.haml	Redesign landing page (again) (#6486)	7 years ago