Merge branch 'develop' into oembed_provider
authorraeno <just.raeno@gmail.com>
Wed, 19 Dec 2018 18:39:44 +0000 (22:39 +0400)
committerraeno <just.raeno@gmail.com>
Wed, 19 Dec 2018 18:39:44 +0000 (22:39 +0400)
commit7fb37804313339f9a2215aea27ece42e8ec31312
treeb7438e9ecd2f4f90e171c16bacbe538cb1ef6e4e
parenta3003364598b42849e384a216948dad810481f51
parentf98ee9402fcafff362ab2446f386214d7a5c41c7
Merge branch 'develop' into oembed_provider
.idea/libraries/gen_smtp.xml
.idea/libraries/html_entities.xml
.idea/libraries/plug_cowboy.xml
.idea/libraries/plug_crypto.xml
.idea/libraries/swoosh.xml
config/config.exs
lib/pleroma/formatter.ex
lib/pleroma/web/router.ex
priv/static/index.html