aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-02 07:01:18 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-02 07:01:18 +0000
commit5eab6561d87f43e8f2f5e4afc93808ece8ead84c (patch)
tree47d7c4fa471d8b45d0e579a5e07ab1c2d9f775c9 /lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
parentaaafec7eb804484ffe445e836040061887773cb7 (diff)
parenta562cb2c3404f707f574d54024c7ee61f808e827 (diff)
downloadpleroma-5eab6561d87f43e8f2f5e4afc93808ece8ead84c.tar.gz
Merge branch 'update/admin-fe-20191001' into 'develop'
Update AdminFE bundle See merge request pleroma/pleroma!1767
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex')
0 files changed, 0 insertions, 0 deletions