diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
commit | 03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6 (patch) | |
tree | 9c6fb949fd8f18ba015821956cc130e75fb879a5 /test/web/twitter_api/twitter_api_controller_test.exs | |
parent | bd97b3614f2353619ab524844d100b6f25527592 (diff) | |
parent | fd0e7d18d96fb242088d8c6bb7ea5e1eb7053ce8 (diff) | |
download | pleroma-03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6.tar.gz pleroma-03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6.zip |
Merge branch 'runtime-emojis' into 'develop'
Runtime configured emojis
See merge request pleroma/pleroma!425
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
0 files changed, 0 insertions, 0 deletions