4 Commits (64fee6ca730ff8419bd0649b748d22d84e2c36ca)

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	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
Eugen Rochko	fd69694749	Add "signed in as" header to some pages (#4523)	7 years ago