Merge branch 'develop' into feature/tag_feed
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 23 Jan 2020 08:42:10 +0000 (11:42 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 23 Jan 2020 08:42:10 +0000 (11:42 +0300)
commit2cfe1b93854c117fda19e54ea17c99f72413a569
tree1ae8ca344d7f970db4f6f6cb9283d3cf21d1756a
parent5ea859644897354dfea47655ce39dda46439040a
parentdddebee047efc4ab1dff6565bef32954695846a7
Merge branch 'develop' into feature/tag_feed
CHANGELOG.md
lib/pleroma/web/router.ex