Merge branch 'master' of github.com:hillelcoren/invoice-ninja

This commit is contained in:
Hillel Coren 2014-05-04 12:11:25 +03:00
commit a41e9c6671

View File

@ -10,7 +10,7 @@
} }
], ],
"require": { "require": {
"laravel/framework": "4.1.*", "laravel/framework": "4.1.25",
"patricktalmadge/bootstrapper": "dev-develop", "patricktalmadge/bootstrapper": "dev-develop",
"zizaco/confide": "3.1.x", "zizaco/confide": "3.1.x",
"anahkiasen/former": "dev-master", "anahkiasen/former": "dev-master",