Merge branch 'develop' into feature/delivery-tracking
authorrinpatch <rinpatch@sdf.org>
Fri, 13 Sep 2019 16:42:53 +0000 (19:42 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 13 Sep 2019 16:42:53 +0000 (19:42 +0300)
commitba70a8cae6c0d00963dc1d9e80f915186397ad06
treed0cfb4e9b6c8771b84f38b9d6175b47fbf4e442d
parentac4a748fad34c02647bf72e802cd9d74205681fe
parent53a3ad60435d4f7eab2dbf1235e5974bac275aa0
Merge branch 'develop' into feature/delivery-tracking
lib/pleroma/user.ex
lib/pleroma/web/router.ex