Merge branch 'develop' into feature/tag_feed
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 17 Dec 2019 06:24:08 +0000 (09:24 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 17 Dec 2019 06:24:08 +0000 (09:24 +0300)
commita879c396bb3a07929d4821ef2c29610808962c6d
treec0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6
parent22fc271e23a5dd1570ea7429b563f6edc42613c4
parent804b961d3c8e0034c7b6057a164126e5d01a084b
Merge branch 'develop' into feature/tag_feed
lib/pleroma/web/router.ex
test/user_test.exs