]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'master' into dev
authorNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 10 Oct 2014 11:33:36 +0000 (13:33 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@smile.fr>
Fri, 10 Oct 2014 11:33:36 +0000 (13:33 +0200)
commitcf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b
tree11e9d276c34b1b287706cb61182bdc71729661e2
parent6b0894c66ad545c04685aaefcc5e89726e2ed4e9
parentaf8292c1de1886cd975d79f0f42df40e0bd1c5bd
Merge branch 'master' into dev

Conflicts:
index.php
CREDITS.md