djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-28 10:33:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript
History
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
core
Merge branch 'master' into glitch-soc/merge-upstream
2020-03-22 16:10:44 +01:00
flavours
[Glitch] Fix frontend crash when deleting announcements
2020-03-22 16:31:01 +01:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01: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
2020-03-27 21:54:44 +01:00
packs
Merge branch 'master' into glitch-soc/merge-upstream
2020-03-22 16:10:44 +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
2020-03-27 21:54:44 +01:00