]> 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: da9b0e3 9c8752a)
Merge remote-tracking branch 'virtualtam/linkdb/remove-globals'
authornodiscc <nodiscc@gmail.com>
Fri, 26 Jun 2015 20:03:10 +0000 (22:03 +0200)
committernodiscc <nodiscc@gmail.com>
Fri, 26 Jun 2015 20:03:10 +0000 (22:03 +0200)
1  2 
application/LinkDB.php patch | diff1 | diff2 | blob | history

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