]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'upstream/v2' into v2
authorJuanjo Benages <juanjo@benages.eu>
Tue, 1 Mar 2016 20:02:13 +0000 (21:02 +0100)
committerJuanjo Benages <juanjo@benages.eu>
Tue, 1 Mar 2016 20:02:13 +0000 (21:02 +0100)

Trivial merge