You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/about
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
8 years ago
..
_administration.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 8 years ago
_contact.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 8 years ago
_features.html.haml Redesign the landing page, mount public timeline on it (#4122) 9 years ago
_forms.html.haml Improve styling of closed registrations message, rename button (#6695) 8 years ago
_links.html.haml Redesign landing page (again) (#6486) 8 years ago
_registration.html.haml Redesign landing page (again) (#6486) 8 years ago
more.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 8 years ago
show.html.haml Merge branch 'master' into glitch-soc/master 8 years ago
terms.html.haml Redesign landing page (again) (#6486) 8 years ago