diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-17 22:36:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 22:36:48 +0200 |
| commit | 62e65dca11e1c39630db2958c514c45407dcdfa7 (patch) | |
| tree | 92b5f9a2f93a2355dd94bac7e63e8fd9c552dafb /app/models/custom_emoji.rb | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 81ef26b67d01aaa693edbdcf7a8f2a6cdfd56920 (diff) | |
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
0 files changed, 0 insertions, 0 deletions