about summary refs log tree commit diff
path: root/.env.test
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-08 19:05:02 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-08 19:05:02 -0500
commit67e77f230e93b2e2ac05632a7cccdb5f26537f3b (patch)
tree6fd9801a67dc1576e5711177fdeeac04f2622098 /.env.test
parent695b53b796767e307d8ce0f5d11c2a82cb85bfd5 (diff)
parent0893b1669548858daee79ab1260fb98646a0b3fa (diff)
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.
Diffstat (limited to '.env.test')
0 files changed, 0 insertions, 0 deletions