mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
..
core
Include necessary JS in auth pages
2019-06-13 22:38:22 +02:00
flavours
Fix NavigationBar styling
2019-06-20 19:19:46 +02:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
locales
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-01 21:00:16 +01:00
mastodon
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-24 15:02:59 +02:00
packs
Put poll options behind content warnings (#10983)
2019-06-08 17:40:59 +02:00
skins
Port Sylvhem's mastodon-light to glitch flavour
2018-05-07 17:00:02 +02:00
styles
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-24 15:02:59 +02:00