Merge branch 'develop' into fix/ap-hide-follows
authorrinpatch <rinpatch@sdf.org>
Fri, 12 Jul 2019 18:43:06 +0000 (21:43 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 12 Jul 2019 18:43:06 +0000 (21:43 +0300)
1  2 
lib/pleroma/web/router.ex

Simple merge