From: Alexandr Danilov Date: Wed, 12 Aug 2015 20:02:19 +0000 (+0300) Subject: Merge remote-tracking branch 'origin/v2' into v2_material X-Git-Tag: 2.0.0-alpha.0~34^2~8 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a737d2a0eeb23588fd8659471c41df0a6b95705a;p=github%2Fwallabag%2Fwallabag.git Merge remote-tracking branch 'origin/v2' into v2_material --- a737d2a0eeb23588fd8659471c41df0a6b95705a