Merge branch 'customizable_auth' into 'develop'
authorhref <href+git-pleroma@random.sh>
Thu, 28 Feb 2019 11:18:01 +0000 (11:18 +0000)
committerhref <href+git-pleroma@random.sh>
Thu, 28 Feb 2019 11:18:01 +0000 (11:18 +0000)
commita47cc5a2cf808b6a06d4d17f195b6a98458ad89d
tree0f32e4326f584f3f846a2126d860b217e2bc332c
parentcf426a719dfe26a11b0bf0a22a08fd45ca5b9dc2
parent3281a3f074f8aac6a05a24cc2eee4e5bad2275bd
Merge branch 'customizable_auth' into 'develop'

Authenticator tweaks

See merge request pleroma/pleroma!875