summaryrefslogtreecommitdiff
path: root/docs/api
AgeCommit message (Collapse)Author
2019-04-06Merge branch 'feature/prometheus' into 'develop'feld
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-04Document PrometheusMark Felder
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis