mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/javascript
History
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
 		2019-09-18 17:25:56 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
flavours Fix composer dropdown toggle buttons (threaded mode and local-only) not working 2019-09-18 00:11:03 +02:00
fonts Theme: Windows 95 2017-10-26 23:22:48 -07:00
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales
…
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00