about summary refs log tree commit diff
path: root/app/views/layouts/modal.html.haml
AgeCommit message (Collapse)Author
2018-01-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02Show mastodon on modal (#6129)Akihiko Odaki
2017-11-20Finalized theme loading and stuffkibigo!
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko