From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 13:07:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'ArthurHoaro/daily-date' into next
X-Git-Tag: v0.5.0~34
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=4a5827ff5adadcd8c1ef9231e485f77c0c376c03

Merge remote-tracking branch 'ArthurHoaro/daily-date' into next
---

4a5827ff5adadcd8c1ef9231e485f77c0c376c03