diff options
author | ThibG <thib@sitedethib.com> | 2018-10-30 20:10:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 20:10:09 +0100 |
commit | 08c0f8b67c7316b020c5623c69d02665146ebd57 (patch) | |
tree | 9411daf86f412a69c2536cfc302b484bd3ea16ae /app/policies/custom_emoji_policy.rb | |
parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
parent | 0d6b8f36aaee9c8c68c64ce4a63bcc66c6faf78d (diff) |
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/policies/custom_emoji_policy.rb')
0 files changed, 0 insertions, 0 deletions