diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:13:39 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:13:39 +0000 |
| commit | da4315b5ef643f07376f159df6fd41636e07e01d (patch) | |
| tree | b38e3fab1f9038661f9e611448c676a69ec64f6b /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 8764f646900f577add5cc606b433870633b2e4d5 (diff) | |
| parent | 3c925e9d889da7f7ec22c98572a9ef2b080f81be (diff) | |
| download | pleroma-da4315b5ef643f07376f159df6fd41636e07e01d.tar.gz | |
Merge branch 'emoji-alphabetical-ordering' into 'develop'
Emojis: Alphabetical ordering
Closes #366
See merge request pleroma/pleroma!515
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
0 files changed, 0 insertions, 0 deletions