]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev
authorcamporez <cadastros@camporez.com>
Sat, 15 Mar 2014 18:03:26 +0000 (15:03 -0300)
committercamporez <cadastros@camporez.com>
Sat, 15 Mar 2014 18:03:26 +0000 (15:03 -0300)

Trivial merge