Fixed font awesome in composer and gitignore

This commit is contained in:
Paolo
2020-01-21 12:18:08 +01:00
parent 4e43d37780
commit 13e24230bc
3 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
bin
documents/
vendor/
/nbproject/
/.idea/
+1 -1
View File
@@ -251,7 +251,7 @@
"codeigniter/framework": "3.*",
"components/jquery": "3.*",
"components/jqueryui": "1.*",
"components/font-awesome": "5.*",
"components/font-awesome": "4.*",
"components/angular.js": "1.3.*",
"easyrdf/easyrdf": "0.9.*",
Generated
+12 -12
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "5fa45f7d529152ca14fc108e2454033f",
"content-hash": "c95c49b4e8106a5aa05a11720c0f6f72",
"hash": "59fc693321fbae0364ec7174a0d0dcb1",
"content-hash": "b377fd50d87a28fdedf6214e4ffb6a6d",
"packages": [
{
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -467,38 +467,38 @@
},
{
"name": "components/font-awesome",
"version": "5.12.0",
"version": "4.7.0",
"source": {
"type": "git",
"url": "https://github.com/components/font-awesome.git",
"reference": "d8646ec635a00b06cc219b7dffed3418444975cc"
"reference": "885308b939369d147bec93174722786bc2c4eedd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/components/font-awesome/zipball/d8646ec635a00b06cc219b7dffed3418444975cc",
"reference": "d8646ec635a00b06cc219b7dffed3418444975cc",
"url": "https://api.github.com/repos/components/font-awesome/zipball/885308b939369d147bec93174722786bc2c4eedd",
"reference": "885308b939369d147bec93174722786bc2c4eedd",
"shasum": ""
},
"type": "component",
"extra": {
"component": {
"styles": [
"css/all.css"
"css/font-awesome.css"
],
"files": [
"css/all.min.css",
"webfonts/*"
"css/font-awesome.min.css",
"css/font-awesome.css.map",
"fonts/*"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"CC-BY-4.0",
"MIT",
"OFL-1.1"
],
"description": "Font Awesome, the iconic SVG, font, and CSS framework.",
"time": "2020-01-08 10:17:47"
"description": "The iconic font designed for use with Twitter Bootstrap.",
"time": "2016-10-25 10:56:23"
},
{
"name": "components/jquery",