Merge branch 'uploader-controller' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 22 Jan 2019 09:03:03 +0000 (09:03 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 22 Jan 2019 09:03:03 +0000 (09:03 +0000)
commitd17a4b18919d05411602454f624381db2a2ac8c7
treee522bd8575764287798f070c6cfcf7b5a812cace
parentafb8d9ec134b9c12a116da27e4c6da7f3e9941a6
parentf9a326909979959d6cb43f66177045bb2adccbf4
Merge branch 'uploader-controller' into 'develop'

Uploader callback controller

See merge request pleroma/pleroma!694