1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-18 00:49:51 +02:00
Commit Graph

57 Commits

Author SHA1 Message Date
Mike Linksvayer
54de9d0e86 Slightly increase accuracy of trademark info:
- use not directly forbideen by certain licenses, rather rights not granted
- CC0-1.0 is one of those licenses with explicit non-grant
2015-12-14 11:03:17 -08:00
Brandon Keepers
1a17c9a94c Merge pull request #305 from github/patent-use
Rename "Patent Grant" to "Patent Use"
2015-11-02 10:57:43 -05:00
Brandon Keepers
15ebedb726 Rename "Patent Grant" to "Patent Use"
Per the discussion in #168, the consumers of the softare are granted the right to use patents. So "Patent Use" makes more sense from a consumer perspective than "Patent Grant".
2015-11-01 22:51:13 -05:00
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Derek Jones
c30ff9e20a Merge remote-tracking branch 'github/gh-pages' into osl-3.0
Conflicts:
	_config.yml
2015-08-06 10:22:19 -07:00
Ben Balter
22cc77f12b first pass at jekyll2ification 2014-07-31 12:36:56 -04:00