Merge branch 'bugfix/mock' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)
commit09416d8a03854e946e681ea65f90fe4f3eca2018
tree79ebc51987ffa0528ef151f8837b976c66de5448
parentbf048ab72f3b0a994b5d8dd6c82bf30780468173
parent87d2805791e1dd6746009e8c1445719e8cbfd31d
Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973