Merge branch 'develop' into oembed_provider
authorraeno <just.raeno@gmail.com>
Tue, 18 Dec 2018 13:59:32 +0000 (14:59 +0100)
committerraeno <just.raeno@gmail.com>
Tue, 18 Dec 2018 13:59:32 +0000 (14:59 +0100)
commita3003364598b42849e384a216948dad810481f51
tree2ed2b04efab457220a60fb7630906b1b26f24df3
parent30812f84518f1b2fcc70a416d1a6b9f81264f3a5
parentb6ae412fcd7c67d64dd1467e8e35d17140e992df
Merge branch 'develop' into oembed_provider
config/config.exs
lib/pleroma/formatter.ex
lib/pleroma/user.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock