Merge branch 'develop' into dtluna/pleroma-refactor/1
authorRoger Braun <roger@rogerbraun.net>
Fri, 5 May 2017 09:46:59 +0000 (11:46 +0200)
committerRoger Braun <roger@rogerbraun.net>
Fri, 5 May 2017 09:46:59 +0000 (11:46 +0200)
commitc48c381e909240dcece9f961e4728fa712d089cc
tree6aa2a1edbfe5d15860ab5090c645bc9ba312ab96
parent6cf7c132282e612514af992c6dea0b03ee5b678d
parentc85998ab8a21f042ab57345a7baa9e1e27c308d1
Merge branch 'develop' into dtluna/pleroma-refactor/1
12 files changed:
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/ostatus/activity_representer.ex
lib/pleroma/web/ostatus/feed_representer.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/salmon/salmon.ex
lib/pleroma/web/twitter_api/representers/activity_representer.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
lib/pleroma/web/web.ex
lib/pleroma/web/web_finger/web_finger.ex
lib/pleroma/web/websub/websub.ex