From: Nicolas Lœuillet Date: Tue, 22 Jul 2014 17:32:24 +0000 (+0200) Subject: Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting X-Git-Tag: 1.8.0^2~27^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=392f9a1b9c16a4dc872437a4f9bae934f3a86858;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting --- 392f9a1b9c16a4dc872437a4f9bae934f3a86858