Merge branch 'develop' into feature/tag_feed
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 14 Jan 2020 13:26:56 +0000 (16:26 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 14 Jan 2020 18:29:14 +0000 (21:29 +0300)
commitc9f45edeac2cc3ed262bb4b30dc7e1120c6fa047
tree3ba35681409d9c5dd9ca4d355ff39d4dd67448d4
parent969769730e0b7578ddc6a5cd02f9b24eff5902a0
parent12b28c8925c2c55e0d7bb66ff3320532a1aade3b
Merge branch 'develop' into feature/tag_feed
CHANGELOG.md
lib/pleroma/web/metadata/utils.ex
lib/pleroma/web/router.ex
test/user_test.exs
test/web/feed/tag_controller_test.exs
test/web/twitter_api/util_controller_test.exs