]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
projects / github / wallabag / wallabag.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
themes/default/_head.twig

1  2 
inc/poche/config.inc.php.new patch | diff1 | diff2 | blob | history

diff --cc inc/poche/config.inc.php.new
Simple merge
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.