]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' into custom_port
authorJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Mon, 7 Oct 2013 10:39:29 +0000 (12:39 +0200)
committerJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Mon, 7 Oct 2013 10:39:29 +0000 (12:39 +0200)

Trivial merge