Alex S 7410aee886 Merge develop to 770-add-emoji-tags ...

Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs

2019-04-06 20:34:00 +07:00

..

admin_api.md

Document the admin API endpoints for controlling follow/unfollow

2019-04-05 11:29:34 -05:00

differences_in_mastoapi_responses.md

Fix preview not being usable in form data

2019-04-02 23:07:16 +03:00

pleroma_api.md

Adding tag to emoji ets table

2019-04-01 17:17:57 +07:00