diff options
| author | robmadole <robmadole@gmail.com> | 2013-05-23 17:21:52 +0400 |
|---|---|---|
| committer | robmadole <robmadole@gmail.com> | 2013-05-23 17:21:52 +0400 |
| commit | fab96da26748b9160b6d652d0d0252c9c7117a0a (patch) | |
| tree | dc8b3ff84c81ca429b38e711ae99e34ddf1874ff /package.json | |
| parent | fd0a94b85e4c93dd1af107f634f185399239e618 (diff) | |
| parent | 233a9237084f0c6bfb974e1ddf5a8265e07a2423 (diff) | |
Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip
Conflicts:
build/assets/font-awesome/css/font-awesome.css
build/assets/font-awesome/less/icons.less
build/assets/font-awesome/less/variables.less
package.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/package.json b/package.json index 40bcfb072..01ceb2b10 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,30 @@ { - "name": "fontawesome", + "name": "font-awesome", "description": "The iconic font designed for Bootstrap", "version": "3.2.0", - "keywords": ["bootstrap", "css", "icon", "font"], + "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"], "homepage": "http://fontawesome.io/", - "author": "Dave Gandy", + "author": { + "name": "Dave Gandy", + "email": "dave@fontawesome.io" + }, "repository": { "type": "git", - "url": "https://github.com/FortAwesome/Font-Awesome" + "url": "https://github.com/FortAwesome/Font-Awesome.git" }, "licenses": [ - {} + { + "type": "SIL OFL 1.1", + "url": "http://scripts.sil.org/OFL" + }, + { + "type": "MIT License", + "url": "http://opensource.org/licenses/mit-license.html" + }, + { + "type": "CC BY 3.0", + "url": "http://creativecommons.org/licenses/by/3.0/" + } ], "devDependencies": { "recess": "1.1.6" |