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 be4849c083 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
..
core
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
flavours
Fix erroneous inclusion of upstream code
2019-12-07 15:53:04 +01: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-12-12 15:40:06 +01:00
packs
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-06 14:38:28 +01: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-12-07 12:28:59 +01:00