Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
authorRoger Braun <roger@rogerbraun.net>
Fri, 21 Apr 2017 16:42:28 +0000 (18:42 +0200)
committerRoger Braun <roger@rogerbraun.net>
Fri, 21 Apr 2017 16:42:28 +0000 (18:42 +0200)
commit1c00eb4a90cddb7518a823d9304f6aee4fd3ef78
tree5528ee6b79531d735dbe7cefd68cfda6dd94c558
parentf51a672ac43696424034107c4f397e2b6b01d623
parent9afc672009ac49075530f44aefd73a17a0c50d43
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
lib/pleroma/user.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/representers/user_representer.ex