]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' into emded-dependencies 273/head
authorJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Tue, 8 Oct 2013 11:04:05 +0000 (13:04 +0200)
committerJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Tue, 8 Oct 2013 11:04:05 +0000 (13:04 +0200)

Trivial merge