Merge branch 'gun' into 'develop'
authorfeld <feld@feld.me>
Wed, 1 Apr 2020 17:05:09 +0000 (17:05 +0000)
committerfeld <feld@feld.me>
Wed, 1 Apr 2020 17:05:09 +0000 (17:05 +0000)
commitef7d2b0f11a9bf74e982b73ae4cec632f93fbebc
tree2058bf1189b7a7ba12b1a160c27a9e92f3fa28bb
parentbfec45bf740f9fcfcea92bbded6bd2c146dc64c1
parent1fcdcb12a717fa3dbd54a5c3778bd216df6449ad
Merge branch 'gun' into 'develop'

Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
lib/pleroma/application.ex
test/web/admin_api/admin_api_controller_test.exs