Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:22 +0000 (10:37 +0200)
committerRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:22 +0000 (10:37 +0200)
commit361a8c42197a92f044fc3d0ceadeee5e3590e96f
tree2aab18f1d841e1af9debd1522942dbe18b141921
parent36e883cd4bed9c07df2a1dc1038265e075bea5c6
parent9afc672009ac49075530f44aefd73a17a0c50d43
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
lib/pleroma/user.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/representers/user_representer.ex