]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'dev' into refactor
authorNicolas Lœuillet <nicolas@loeuillet.org>
Wed, 23 Jul 2014 11:42:30 +0000 (13:42 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Wed, 23 Jul 2014 11:42:30 +0000 (13:42 +0200)
commit505a74ad1de7cf2cd3605e793233365501f03d87
tree41206132200aa9390e11d600ad2b84ffa23242e4
parenta818ff2000c721c6f078c206c3f5214c558a5546
parentebd6bf6007e0fad4c3e11dac0e79f687e1d195a2
Merge branch 'dev' into refactor

Conflicts:
check_setup.php
index.php
index.php
themes/baggy/view.twig
themes/default/view.twig