Merge branch 'develop' into 'develop'
authorlain <lain@soykaf.club>
Tue, 7 Jul 2020 11:41:56 +0000 (11:41 +0000)
committerlain <lain@soykaf.club>
Tue, 7 Jul 2020 11:41:56 +0000 (11:41 +0000)
commit4b53499bdcd8df59c30c0326eebfe30a7a13161e
treea3bb635f99366c4ae9f4774fa9713a8250cd4408
parent9ad305209aabd8619a397060f979c1f4e735def3
parenta784c09db861c097557fe62f7e451fcd457c9740
Merge branch 'develop' into 'develop'

added hyper:// to default protocols

See merge request pleroma/pleroma!2727