]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
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)
commit7d0a0d8a7adf11b5ed41248d35645fc350b85f55
tree5a56e4af2e360a2cd78db49ed51fcf76a6fbd00e
parent09850e6a20b43a50ef28ebeeeb13f27597cd7831
parent5a2cbde945e5729bef59c0c45a0da22fbbd092b3
Merge pull request #107 from pikzen/fix-copying

Fix license info: reverted qr.js to GPL, add full GPLv3 and CC-BY licenses