]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'mariroz-dev' into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 20 Feb 2014 12:03:59 +0000 (13:03 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 20 Feb 2014 12:03:59 +0000 (13:03 +0100)

Trivial merge