Merge branch 'develop' into feature/incoming_ostatus
authorRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 07:18:49 +0000 (09:18 +0200)
committerRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 07:18:49 +0000 (09:18 +0200)
commite8882ab3daa754aea8b2b1a96b7532c14530bbdc
tree294a5483a5a82d0c59bd0c98984973bf038e04ab
parentb91ccef2371fb0bbc23638b174e815dd7189482e
parentfb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26
Merge branch 'develop' into feature/incoming_ostatus
lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api.ex