Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Wed, 12 Apr 2017 15:47:56 +0000 (17:47 +0200)
committerRoger Braun <roger@rogerbraun.net>
Wed, 12 Apr 2017 15:47:56 +0000 (17:47 +0200)
1  2 
lib/pleroma/web/router.ex

Simple merge