diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:56:29 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:56:29 +0000 |
commit | 14054dd582f905439bb73368335f93bbb9bc23c7 (patch) | |
tree | d5eefa933d2673cb9c0f7147c72da58a887307ec /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 33b033421649f6a7354616ff3458b856ca89637c (diff) | |
parent | 748fff6544cc70476bb0892a661d4d8c7f6ee295 (diff) | |
download | pleroma-14054dd582f905439bb73368335f93bbb9bc23c7.tar.gz |
Merge branch 'feature/auto-shortcodes' into 'develop'
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions