1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge branch 'gh-pages' into patch-1

This commit is contained in:
Mike Linksvayer 2017-09-19 14:55:17 -07:00 committed by GitHub
commit 6709fa7d18
3 changed files with 5 additions and 5 deletions

View File

@ -12,7 +12,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo
using: using:
- Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE
- OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE
- Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE?at=develop
permissions: permissions:
- commercial-use - commercial-use

View File

@ -10,9 +10,9 @@ description: This commercially-friendly copyleft license provides the ability to
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
using: using:
- Clojure: https://github.com/clojure/clojure/blob/master/epl-v10.html - Eclipse Che: https://github.com/eclipse/che/blob/master/LICENSE
- JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt - JUnit: https://github.com/junit-team/junit4/blob/master/LICENSE-junit.txt
- openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT - openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE
permissions: permissions:
- commercial-use - commercial-use

View File

@ -13,8 +13,8 @@ note: The Mozilla Foundation recommends taking the additional step of adding a b
using: using:
- Servo: https://github.com/servo/servo/blob/master/LICENSE - Servo: https://github.com/servo/servo/blob/master/LICENSE
- Syncthing: https://github.com/syncthing/syncthing/blob/master/LICENSE
- TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE
- LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL
permissions: permissions:
- commercial-use - commercial-use