Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
authorRoger Braun <roger@rogerbraun.net>
Thu, 20 Apr 2017 08:16:41 +0000 (10:16 +0200)
committerRoger Braun <roger@rogerbraun.net>
Thu, 20 Apr 2017 08:16:41 +0000 (10:16 +0200)
1  2 
lib/pleroma/web/router.ex

Simple merge