Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-06 06:48:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: merge-conflict resolution

Browse source
This commit is contained in:
Christy Jacob 2019-09-30 03:45:53 +05:30
parent faa63aba97
commit 50eff01818
1 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
composer.lock generated
View file

@ -40,7 +40,7 @@
"BSD-3-Clause"
],
"description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)",
"time": "2019-09-21 12:46:08"
"time": "2019-09-21T12:46:08+00:00"
},
{
"name": "appwrite/php-clamav",
@ -85,7 +85,7 @@
"clamav",
"php"
],
"time": "2019-09-08 17:36:32"
"time": "2019-09-08T17:36:32+00:00"
},
{
"name": "appwrite/sdk-generator",
@ -93,7 +93,11 @@
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator",
<<<<<<< HEAD
"reference": "2cdf218f735e5c52a47f1d8977f460261fd9017f"
=======
"reference": "22cd594e2406fbcfc64262fdcdfa78069bf29aa0"
>>>>>>> upstream/master
},
"require": {
"ext-curl": "*",
@ -123,7 +127,11 @@
}
],
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
<<<<<<< HEAD
"time": "2019-09-22 12:47:11"
=======
"time": "2019-09-28 23:31:14"
>>>>>>> upstream/master
},
{
"name": "bacon/bacon-qr-code",
@ -229,7 +237,7 @@
"resque"
],
"abandoned": "resque/php-resque",
"time": "2017-04-12 21:58:19"
"time": "2017-04-12T21:58:19+00:00"
},
{
"name": "chrisboulton/php-resque-scheduler",
@ -265,7 +273,7 @@
}
],
"description": "php-resque-scheduler is a PHP port of resque-scheduler, which adds support for scheduling items in the future to Resque.",
"time": "2016-11-28 22:38:06"
"time": "2016-11-28T22:38:06+00:00"
},
{
"name": "colinmollenhour/credis",
@ -361,7 +369,7 @@
"ssl",
"tls"
],
"time": "2019-08-30 08:44:50"
"time": "2019-08-30T08:44:50+00:00"
},
{
"name": "dasprid/enum",
@ -617,7 +625,7 @@
"rest",
"web service"
],
"time": "2019-08-23 22:16:30"
"time": "2019-08-23T22:16:30+00:00"
},
{
"name": "guzzlehttp/promises",
@ -668,7 +676,7 @@
"keywords": [
"promise"
],
"time": "2019-07-02 14:54:06"
"time": "2019-07-02T14:54:06+00:00"
},
{
"name": "guzzlehttp/psr7",
@ -739,7 +747,7 @@
"uri",
"url"
],
"time": "2019-08-13 16:05:52"
"time": "2019-08-13T16:05:52+00:00"
},
{
"name": "influxdb/influxdb-php",
@ -1018,13 +1026,13 @@
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/mustangostang/spyc.git",
"reference": "576c42ecbc9630b52a95da3279f07278572c6b15"
"url": "git@github.com:mustangostang/spyc.git",
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/576c42ecbc9630b52a95da3279f07278572c6b15",
"reference": "576c42ecbc9630b52a95da3279f07278572c6b15",
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/4627c838b16550b666d15aeae1e5289dd5b77da0",
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0",
"shasum": ""
},
"require": {
@ -1061,7 +1069,7 @@
"yaml",
"yml"
],
"time": "2017-07-23 16:38:44"
"time": "2019-09-10T13:16:29+00:00"
},
{
"name": "phpmailer/phpmailer",
@ -1228,7 +1236,7 @@
"request",
"response"
],
"time": "2019-08-29 13:16:46"
"time": "2019-08-29T13:16:46+00:00"
},
{
"name": "psr/log",
@ -1275,7 +1283,7 @@
"psr",
"psr-3"
],
"time": "2018-11-21 13:42:00"
"time": "2018-11-21T13:42:00+00:00"
},
{
"name": "ralouphie/getallheaders",
@ -1373,7 +1381,7 @@
"polyfill",
"portable"
],
"time": "2019-08-06 08:03:45"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@ -1432,7 +1440,7 @@
"portable",
"shim"
],
"time": "2019-09-17 10:46:08"
"time": "2019-09-17T10:46:08+00:00"
},
{
"name": "twig/twig",
@ -1499,7 +1507,11 @@
"keywords": [
"templating"
],
<<<<<<< HEAD
"time": "2019-09-20 12:53:54"
=======
"time": "2019-09-20T12:53:54+00:00"
>>>>>>> upstream/master
},
{
"name": "utopia-php/abuse",
@ -1546,7 +1558,7 @@
"upf",
"utopia"
],
"time": "2019-05-08 20:26:59"
"time": "2019-05-08T20:26:59+00:00"
},
{
"name": "utopia-php/cache",
@ -1593,7 +1605,7 @@
"upf",
"utopia"
],
"time": "2019-05-08 20:28:54"
"time": "2019-05-08T20:28:54+00:00"
},
{
"name": "utopia-php/cli",
@ -1641,7 +1653,7 @@
"upf",
"utopia"
],
"time": "2019-05-08 20:27:54"
"time": "2019-05-08T20:27:54+00:00"
},
{
"name": "utopia-php/framework",
@ -1685,7 +1697,7 @@
"php",
"upf"
],
"time": "2019-08-15 06:36:30"
"time": "2019-08-15T06:36:30+00:00"
},
{
"name": "utopia-php/locale",
@ -1731,7 +1743,7 @@
"upf",
"utopia"
],
"time": "2019-08-17 08:18:24"
"time": "2019-08-17T08:18:24+00:00"
},
{
"name": "utopia-php/registry",
@ -1778,7 +1790,7 @@
"upf",
"utopia"
],
"time": "2019-05-08 20:25:57"
"time": "2019-05-08T20:25:57+00:00"
}
],
"packages-dev": null,