Skip to content
This repository was archived by the owner on Mar 24, 2024. It is now read-only.

Commit 3fa4805

Browse files
author
Lorenz Bausch
committed
updated Composer dependencies
1 parent 16eadd2 commit 3fa4805

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
"require": {
77
"laravel/framework": "4.2.*",
88
"rcrowe/twigbridge": "0.6.*",
9-
"stolz/assets": "dev-master",
10-
"components/jquery": "1.11.*@dev",
9+
"stolz/assets": "0.0.*",
10+
"components/jquery": "1.11.*",
1111
"twbs/bootstrap": "3.3.*",
12-
"components/font-awesome": "4.2.*@dev",
12+
"fortawesome/font-awesome": "4.3.0",
1313
"afarkas/html5shiv": "dev-master",
14-
"rogeriopradoj/respond": "dev-composer",
15-
"kwipi/famfamfam-flags": "dev-master",
14+
"rogeriopradoj/respond": "1.4.2",
1615
"datatables/datatables": "dev-master",
17-
"sheillendra/raphael": "dev-master",
18-
"nesbot/Carbon": "*"
16+
"sheillendra/raphael": "dev-master"
1917
},
2018
"autoload": {
2119
"classmap": [

public/assets/css/font-awesome.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/css/font-awesome.css
1+
../../../vendor/fortawesome/font-awesome/css/font-awesome.css
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/fonts/FontAwesome.otf
1+
../../../vendor/fortawesome/font-awesome/fonts/FontAwesome.otf
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/fonts/fontawesome-webfont.eot
1+
../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.eot
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/fonts/fontawesome-webfont.svg
1+
../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.svg
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/fonts/fontawesome-webfont.ttf
1+
../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.ttf
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../components/font-awesome/fonts/fontawesome-webfont.woff
1+
../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.woff
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.woff2

0 commit comments

Comments
 (0)