djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-12 02:32:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript
History
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
core
Fix CW fold/unfold in remote interaction dialog
2019-02-17 15:40:49 +01:00
flavours
[Glitch] fix: update to emoji-mart 2.10.0
2019-03-16 21:39:13 +01:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-02 15:36:53 +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
2019-03-18 18:03:27 +01:00
packs
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-17 12:26:55 +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-03-18 18:03:27 +01:00