luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 12:52:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
flavours [Glitch] Hide floating action button on thread views 2018-09-11 16:29:46 +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-09-11 16:51:26 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +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-09-11 16:51:26 +02:00