]> git.immae.eu Git - github/wallabag/wallabag.git/commit
projects / github / wallabag / wallabag.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2916d24 894c36e)
Merge remote branch 'upstream/dev' into dev 272/head
authorJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Mon, 7 Oct 2013 12:25:24 +0000 (14:25 +0200)
committerJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>
Mon, 7 Oct 2013 12:25:24 +0000 (14:25 +0200)
commit5e07dc8b51f9612de5f5a00bbac399c777e82fa4
tree66454b9a6dd4e8cd045dd8451a268cf914e583b8tree | snapshot
parent2916d24b209e1e36cf22cb902d7e6dc34113c7e5commit | diff
parent894c36ea32d38d425e27dae43a29dcd9e669040ecommit | diff
Merge remote branch 'upstream/dev' into dev

Conflicts:
themes/default/_head.twig
inc/poche/config.inc.php.new diff1 | diff2 | blob | history
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.