David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-02-02 08:39:52 -06:00
..
_contact.html.haml	Do not create empty a element when there is no e-mail (#4455)	2017-07-30 16:24:18 +02:00
_features.html.haml	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
_links.html.haml	Unify links container implementation in about pages (#6382)	2018-02-02 10:32:21 +01:00
_registration.html.haml	Adjust landing pages 2 (#4967)	2017-09-16 18:39:11 +02:00
more.html.haml	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
show.html.haml	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
terms.html.haml	Unify links container implementation in about pages (#6382)	2018-02-02 10:32:21 +01:00