]> 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: a38d50e 625bb56)
Merge remote-tracking branch 'origin/master' into 2.2
authorJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 21 Nov 2016 14:15:30 +0000 (15:15 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 21 Nov 2016 14:15:30 +0000 (15:15 +0100)
1  2 
app/config/config.yml patch | diff1 | diff2 | blob | history
composer.json patch | diff1 | diff2 | blob | history

diff --cc app/config/config.yml
Simple merge
diff --cc composer.json
Simple merge
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.