luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 08:54:40 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
..
core Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
flavours Port emojimart 2.6.1 changes to glitch flavour 2018-06-12 17:43:50 -05:00
fonts
images
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
packs Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +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-06-15 20:51:39 +02:00