]> 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: f5b0592 d33c5d4)
Merge remote-tracking branch 'Marsup/firefox-social' into next
authornodiscc <nodiscc@gmail.com>
Fri, 22 May 2015 19:04:36 +0000 (21:04 +0200)
committernodiscc <nodiscc@gmail.com>
Fri, 22 May 2015 19:04:36 +0000 (21:04 +0200)
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