]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.2
authorJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 21 Nov 2016 14:15:30 +0000 (15:15 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 21 Nov 2016 14:15:30 +0000 (15:15 +0100)
commiteb2d613c3ed95d741e987917f976da349ea240eb
tree589ebf10ebf557e6fb4d8524f08f13dacfc92ff2
parenta38d50e1e8a6ff509852b2fee8cd94d79aea7919
parent625bb561813222aea8a7a2e84e30e9f9de697017
Merge remote-tracking branch 'origin/master' into 2.2
app/config/config.yml
composer.json