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)
commitf3e7771fd6b2d6c3fd77de5d4392084ef75c64fd
tree3bda45271895bb5611833cb6c0ca4cd05b04cf7a
parent129e30f4658312e8bb1737fd5577497107fbdeb1
parentbf22b1547c07df841b152c72d1224e6173c275ed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
lib/pleroma/web/router.ex