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

…

_features.html.haml

…

_links.html.haml

Unify links container implementation in about pages (#6382)

2018-02-02 10:32:21 +01:00

_registration.html.haml

…

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