|
@@ -4,7 +4,7 @@
|
|
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
|
|
"This file is @generated automatically"
|
|
"This file is @generated automatically"
|
|
|
],
|
|
],
|
|
|
- "content-hash": "10c55cd0c4fc711e8afeeeeeee7580e3",
|
|
|
|
|
|
|
+ "content-hash": "3dc19ce0f64f36befc7c2bdd5ada1fa0",
|
|
|
"packages": [
|
|
"packages": [
|
|
|
{
|
|
{
|
|
|
"name": "bacon/bacon-qr-code",
|
|
"name": "bacon/bacon-qr-code",
|
|
@@ -449,7 +449,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
|
|
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
|
|
|
"reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
|
|
"reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"doctrine/lexer": "^1.0.1",
|
|
"doctrine/lexer": "^1.0.1",
|
|
@@ -1147,7 +1157,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
|
|
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
|
|
|
"reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
|
|
"reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"ext-mbstring": "*",
|
|
"ext-mbstring": "*",
|
|
@@ -1202,7 +1222,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391",
|
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391",
|
|
|
"reference": "c5a5097156387970e6f0ccfcdf03f752856f3391",
|
|
"reference": "c5a5097156387970e6f0ccfcdf03f752856f3391",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"ext-fileinfo": "*",
|
|
"ext-fileinfo": "*",
|
|
@@ -1596,7 +1626,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
|
|
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
|
|
|
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
|
|
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"ext-tokenizer": "*",
|
|
"ext-tokenizer": "*",
|
|
@@ -1751,7 +1791,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
|
|
"url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
|
|
|
"reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
|
|
"reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"php": ">=5.3.9"
|
|
"php": ">=5.3.9"
|
|
@@ -3761,7 +3811,17 @@
|
|
|
"type": "zip",
|
|
"type": "zip",
|
|
|
"url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
|
|
"url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
|
|
|
"reference": "13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
|
|
"reference": "13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+ "shasum": "",
|
|
|
|
|
+ "mirrors": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
|
|
|
|
|
+ "preferred": true
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+=======
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
|
|
|
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
|
|
|
},
|
|
},
|
|
|
"require": {
|
|
"require": {
|
|
|
"illuminate/auth": "^5.1",
|
|
"illuminate/auth": "^5.1",
|