diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
| commit | 84d93cca6e2ac0b552a6f5c570fbcfce766200a1 (patch) | |
| tree | a8a9c46ee6f70dd4b8824499a49b1e39e2980dc6 /library/font_awesome/composer.json | |
| parent | 45512e6aba602604143e946cca49c363ae88aa1e (diff) | |
| parent | 9446d0cbb463af6a256efebf97e10618469f1193 (diff) | |
| download | volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.gz volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.bz2 volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/font_awesome/composer.json')
| -rw-r--r-- | library/font_awesome/composer.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/font_awesome/composer.json b/library/font_awesome/composer.json index eb86b9710..f1b9f3707 100644 --- a/library/font_awesome/composer.json +++ b/library/font_awesome/composer.json @@ -1,6 +1,6 @@ { "name": "fortawesome/font-awesome", - "description": "The iconic font designed for Bootstrap", + "description": "The iconic font and CSS framework", "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"], "homepage": "http://fontawesome.io/", "authors": [ @@ -13,7 +13,7 @@ ], "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "4.0.x-dev" } }, "license": [ @@ -22,6 +22,6 @@ ], "require-dev": { "jekyll": "1.0.2", - "lessc": "1.3.3" + "lessc": "1.4.2" } } |