Merge branch 'develop' into feature/activitypub
authorRoger Braun <roger@rogerbraun.net>
Sun, 11 Feb 2018 08:50:55 +0000 (09:50 +0100)
committerRoger Braun <roger@rogerbraun.net>
Sun, 11 Feb 2018 08:50:55 +0000 (09:50 +0100)
commit52200998c997576c9008cbe50b0a7b9f0e6134cc
treec0d68f476442b8dd86fca1e182d5c09553800810
parent4a13b8488787773d09f67d1a436d5906e2f5b171
parent0e2ca77eec511857508208d3faeb9217c4496f8a
Merge branch 'develop' into feature/activitypub
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/router.ex
lib/pleroma/web/web_finger/web_finger.ex