From: Nicolas Lœuillet Date: Thu, 17 Oct 2013 15:04:12 +0000 (+0200) Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev X-Git-Tag: 1.1.0~3 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c1e24b0461111affb121f5a1bc9d42acf94caf93;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of https://github.com/inthepoche/poche into dev --- c1e24b0461111affb121f5a1bc9d42acf94caf93