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
|
2018-02-23 23:28:31 +09:00 |
|
Eugen Rochko
|
51e1e65c84
|
Fix container regression (#6531)
* Update public.html.haml
* Update auth.html.haml
* Update modal.html.haml
|
2018-02-22 03:04:27 +01:00 |
|
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 |