mastodon-docker-playground/app/javascript
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
..
core
flavours Fix video modal 2018-04-09 00:11:10 +02:00
fonts
images Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
locales
mastodon Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
packs Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
skins/vanilla/win95
styles Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00