]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'upstream/dev' into dev 1588/head
authorJuanjo Benages <juanjo@benages.eu>
Sun, 17 Jan 2016 18:31:49 +0000 (19:31 +0100)
committerJuanjo Benages <juanjo@benages.eu>
Sun, 17 Jan 2016 18:31:49 +0000 (19:31 +0100)

Trivial merge