Merge branch 'develop' into oembed_provider
authorraeno <just.raeno@gmail.com>
Fri, 14 Dec 2018 19:28:35 +0000 (20:28 +0100)
committerraeno <just.raeno@gmail.com>
Fri, 14 Dec 2018 19:28:35 +0000 (20:28 +0100)
commit90b00701ff0e2622825ef4c86409a27691763baf
tree7fa693fe9ce921b50d103d2c61c4b9a9de28a91f
parent9ff61ed793b7fd968b51c5f6e4b72958adeae977
parent980131b4db4f2da319d9054889bdb962aa8c837e
Merge branch 'develop' into oembed_provider
lib/pleroma/web/router.ex
priv/static/index.html