From: Nicolas Lœuillet Date: Wed, 12 Mar 2014 11:55:48 +0000 (+0100) Subject: Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform... X-Git-Tag: 1.6.0^2~34 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f7382cd8c3141c2d1a7dd4fc129cb4b53992d95c;p=github%2Fwallabag%2Fwallabag.git Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict fix of conflict of s shortcat and entering s in input fields --- f7382cd8c3141c2d1a7dd4fc129cb4b53992d95c