Merge branch 'bugfix/mock' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 16:46:23 +0000 (19:46 +0300)
commit073f5490ece616fd9602382c1be1347457cbbe79
tree2d785eb4396e2dc79bb6b0bed5d766b393479dd5
parent7528a7e447c2a30cd0ea9c87a10dcbb6d0dcb711
Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973
test/plugs/admin_secret_authentication_plug_test.exs
test/plugs/oauth_scopes_plug_test.exs