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)
1  2 
lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api.ex

Simple merge