]> 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: 09850e6 5a2cbde)
Merge pull request #107 from pikzen/fix-copying
authornodiscc <nodiscc@gmail.com>
Tue, 27 Jan 2015 12:22:28 +0000 (13:22 +0100)
committernodiscc <nodiscc@gmail.com>
Tue, 27 Jan 2015 12:22:28 +0000 (13:22 +0100)
Fix license info: reverted qr.js to GPL, add full GPLv3 and CC-BY licenses


Trivial merge
The personal, minimalist, super-fast, database free, bookmarking service - community repo