Merge remote-tracking branch 'origin/develop' into pleroma-conversations
authorlain <lain@soykaf.club>
Thu, 8 Aug 2019 14:04:20 +0000 (16:04 +0200)
committerlain <lain@soykaf.club>
Thu, 8 Aug 2019 14:04:20 +0000 (16:04 +0200)
commita2b98f6d58218c5806247743aa0a2a600c9959ab
tree49914ac1e30561e1180651ad6b0fef5d96ecfb5c
parente4a01d253ef7ab09d028198e5e39b9aba357486c
parentb18234e04c76daa564e0d8157dcd09566485da24
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
lib/pleroma/user.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_utils_test.exs