gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-08 18:14:39 +00:00
Code Issues Actions 42 Packages Projects Releases Wiki Activity
246c313d45
mastodon/app/javascript
History
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
flavours Update poylfills (fixes #662) 2018-08-23 22:58:25 +02:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +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 2018-08-24 15:10:34 +02:00