about summary refs log tree commit diff
path: root/app/serializers/activitypub/emoji_serializer.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-27 14:02:32 +0100
committerGitHub <noreply@github.com>2019-03-27 14:02:32 +0100
commit7535c607f40cb31fbb68c8f416992c3c5fcc929d (patch)
tree7026413e6cffcfeb4525212dd25adadd17f82d16 /app/serializers/activitypub/emoji_serializer.rb
parentbdf4f56f9a9052668e7cce1ce7863268e03d9c86 (diff)
parent48230b57d2c62912cf46b78911414d370bdea6bc (diff)
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/activitypub/emoji_serializer.rb')
0 files changed, 0 insertions, 0 deletions