]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branch 'upstream/dev' into dev
authorMaryana Rozhankivska <mariroz@mr.lviv.ua>
Thu, 20 Feb 2014 09:42:18 +0000 (11:42 +0200)
committerMaryana Rozhankivska <mariroz@mr.lviv.ua>
Thu, 20 Feb 2014 09:42:18 +0000 (11:42 +0200)

Trivial merge