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.

imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		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	Redesign landing page (again) (#6486)	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 branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
terms.html.haml	Redesign landing page (again) (#6486)	7 years ago