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)
commit5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2
treeac709009ada18539ae9a48ab54712b6876640936
parentcc330421fd789f002d14e19692c4fbe75c0df4f2
parent9167a2ebe30f3835f2e9139443dc60f8f0c44563
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
lib/pleroma/web/router.ex