diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-05-14 18:49:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-05-14 18:49:10 +0200 |
| commit | f94aebafe500c5e967e6a27d45217e1afe67f695 (patch) | |
| tree | 1523b1279eb7f90fa1d517d4ba73b2ecaa912686 /app/serializers/rest/custom_emoji_serializer.rb | |
| parent | e1d282023432ff4a88cb795f3a9889704314e448 (diff) | |
| parent | c9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/serializers/rest/custom_emoji_serializer.rb')
0 files changed, 0 insertions, 0 deletions