David Yip
|
54148b9a4a
|
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
|
2c1ed5f872
|
Show mastodon on modal (#6129)
|
2018-01-02 05:07:56 +01:00 |
|
kibigo!
|
bdbbd06dad
|
Finalized theme loading and stuff
|
2017-11-20 22:13:37 -08:00 |
|
Eugen Rochko
|
df605f0f8b
|
Add "signed in as" header to some pages (#4523)
|
2017-08-05 04:24:58 +02:00 |
|