]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
projects / github / shaarli / Shaarli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa22244 4a1a119)
Merge branch 'picwall-direct-link' into next v0.0.44beta
authornodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:24:51 +0000 (14:24 +0100)
committernodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:24:51 +0000 (14:24 +0100)
1  2 
index.php patch | diff1 | diff2 | blob | history

diff --cc index.php
Simple merge
The personal, minimalist, super-fast, database free, bookmarking service - community repo