diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
| commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
| tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /public/emoji/1f531.svg | |
| parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
| parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'public/emoji/1f531.svg')
0 files changed, 0 insertions, 0 deletions