keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility

Browse source 
Hotfix: Restore composer 5 6 compatibility
This commit is contained in:
Hypolite Petovan 2018-03-23 20:53:52 -04:00 committed by GitHub
commit ed93fce743
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
bin/auth_ejabberd.php Normal file → Executable file
View file

0
bin/composer.phar Normal file → Executable file
View file

0
bin/daemon.php Normal file → Executable file
View file

0
bin/run_xgettext.sh Normal file → Executable file
View file

0
bin/worker.php Normal file → Executable file
View file

17
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "7d90cfe4354cd5ca36b74a3ecc471eeb",
"content-hash": "0811acc361f70e08cce3ec09940cbf2d",
"packages": [
{
"name": "asika/simple-console",
@ -1261,23 +1261,24 @@
},
{
"name": "paragonie/constant_time_encoding",
"version": "v2.2.2",
"version": "v1.0.2",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33"
"reference": "6111a38faf6fdebc14e36652d22036f379ba58d3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/eccf915f45f911bfb189d1d1638d940ec6ee6e33",
"reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/6111a38faf6fdebc14e36652d22036f379ba58d3",
"reference": "6111a38faf6fdebc14e36652d22036f379ba58d3",
"shasum": ""
},
"require": {
"php": "^7"
"php": "^5.3|^7"
},
"require-dev": {
"phpunit/phpunit": "^6|^7",
"paragonie/random_compat": "^1|^2",
"phpunit/phpunit": "4.*|5.*",
"vimeo/psalm": "^1"
},
"type": "library",
@ -1319,7 +1320,7 @@
"hex2bin",
"rfc4648"
],
"time": "2018-03-10T19:47:49+00:00"
"time": "2018-03-10T19:46:06+00:00"
},
{
"name": "paragonie/random_compat",