Updated deps
This commit is contained in:
parent
ed4ba66723
commit
b2b716048e
2 changed files with 0 additions and 25 deletions
|
@ -32,11 +32,7 @@
|
||||||
|
|
||||||
"appwrite/php-clamav": "1.0.*",
|
"appwrite/php-clamav": "1.0.*",
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
"utopia-php/framework": "0.3.7",
|
|
||||||
=======
|
|
||||||
"utopia-php/framework": "0.4.0",
|
"utopia-php/framework": "0.4.0",
|
||||||
>>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
|
|
||||||
"utopia-php/abuse": "0.2.*",
|
"utopia-php/abuse": "0.2.*",
|
||||||
"utopia-php/audit": "0.3.*",
|
"utopia-php/audit": "0.3.*",
|
||||||
"utopia-php/cache": "0.2.*",
|
"utopia-php/cache": "0.2.*",
|
||||||
|
|
21
composer.lock
generated
21
composer.lock
generated
|
@ -4,11 +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"
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
"content-hash": "1df9fdb337c6030db4bb5f0e9868f9c3",
|
|
||||||
=======
|
|
||||||
"content-hash": "7f6cbe77fe2e0f8bdff33c37a4d9ca11",
|
"content-hash": "7f6cbe77fe2e0f8bdff33c37a4d9ca11",
|
||||||
>>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
|
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "appwrite/php-clamav",
|
"name": "appwrite/php-clamav",
|
||||||
|
@ -1600,18 +1596,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/framework",
|
"name": "utopia-php/framework",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "0.3.7",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/utopia-php/framework.git",
|
|
||||||
"reference": "23156b3d604fd9586f2e8c6c449b2fc6a82c10bc"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/utopia-php/framework/zipball/23156b3d604fd9586f2e8c6c449b2fc6a82c10bc",
|
|
||||||
"reference": "23156b3d604fd9586f2e8c6c449b2fc6a82c10bc",
|
|
||||||
=======
|
|
||||||
"version": "0.4.0",
|
"version": "0.4.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -1622,7 +1606,6 @@
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/framework/zipball/30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
|
"url": "https://api.github.com/repos/utopia-php/framework/zipball/30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
|
||||||
"reference": "30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
|
"reference": "30aeb2aeecf8ea2ab83242efad0f5f9fab8d4be5",
|
||||||
>>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
|
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1653,11 +1636,7 @@
|
||||||
"php",
|
"php",
|
||||||
"upf"
|
"upf"
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
"time": "2020-06-21T11:29:58+00:00"
|
|
||||||
=======
|
|
||||||
"time": "2020-06-25T18:21:48+00:00"
|
"time": "2020-06-25T18:21:48+00:00"
|
||||||
>>>>>>> 17b9dc76a60403ef4e680ee92f3c845a5762effd
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/locale",
|
"name": "utopia-php/locale",
|
||||||
|
|
Loading…
Reference in a new issue