eal f9719b064c Merge branch 'fix/emoji-picker' into 'develop' ...

set visible_in_picker to true in custom_emojis

Closes #177 and mastofe#16

See merge request pleroma/pleroma!188

2018-06-05 21:18:25 +00:00

..

views

Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api

2018-05-26 16:00:59 +02:00

mastodon_api_controller.ex

Merge branch 'fix/emoji-picker' into 'develop'

2018-06-05 21:18:25 +00:00

mastodon_api.ex

Format the code.

2018-03-30 15:01:53 +02:00

mastodon_socket.ex

Detect and try to stream incoming "direct" messages

2018-05-12 17:40:59 -04:00