diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-07 13:41:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 13:41:56 +0100 |
| commit | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (patch) | |
| tree | 0d3596a944cd4ddc27c8c3989f039f640730f70c /app/models/custom_emoji.rb | |
| parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
| parent | f63dad52943c757489975e0c39e771b6bc96e5ba (diff) | |
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
0 files changed, 0 insertions, 0 deletions