]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #658 from mariroz/dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 22 Apr 2014 18:48:42 +0000 (20:48 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 22 Apr 2014 18:48:42 +0000 (20:48 +0200)
inc/poche/config.inc.php.new removed


Trivial merge