Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
authorlain <lain@soykaf.club>
Sat, 1 Dec 2018 08:55:46 +0000 (09:55 +0100)
committerlain <lain@soykaf.club>
Sat, 1 Dec 2018 08:55:46 +0000 (09:55 +0100)
commitc443c9bd72b04b8a24d904bc20fde0d4ffca71d7
tree1044379e9e6867ded303f81a6ca49da83e01cfd2
parent1c67277c8031be2212d6faf84c143ac11462c87b
parent8c3ff06e35e11a40cf4eb35a41a2019b7496e62c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex