From: nodiscc <nodiscc@gmail.com>
Date: Fri, 10 Apr 2015 18:30:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'pikzen/disable-public' into next
X-Git-Tag: v0.5.0~47
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=0c45b01cc2af1d0c8771f4c20de3e8f732c93080

Merge remote-tracking branch 'pikzen/disable-public' into next
---

0c45b01cc2af1d0c8771f4c20de3e8f732c93080