Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
_administration.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
_contact.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +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 branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
terms.html.haml	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00