imncls
|
c0aabbec0f
|
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
|
7 years ago |
Eugen Rochko
|
51e1e65c84
|
Fix container regression (#6531)
* Update public.html.haml
* Update auth.html.haml
* Update modal.html.haml
|
7 years ago |
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 |
