4 commits

Author	SHA1	Message	Date
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	2018-01-02 00:11:41 -06:00
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
kibigo!	8aeda4f064	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
Eugen Rochko	fd69694749	Add "signed in as" header to some pages (#4523)	2017-08-05 04:24:58 +02:00