extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

keep composer happy: remove doublicate diff2html, lowercase Horde_Text_Diff and update lock file

Browse Source
This commit is contained in:
Ralf Becker 2019-03-01 19:42:16 +01:00
parent a5ca61e7db
commit 5006344ed1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -75,7 +75,6 @@
"bower-asset/jquery-touchswipe": "1.6.*", "bower-asset/jquery-touchswipe": "1.6.*",
"bower-asset/jquery-ui":"=1.11.2", "bower-asset/jquery-ui":"=1.11.2",
"bower-asset/cropper":"2.3.*", "bower-asset/cropper":"2.3.*",
"bower-asset/diff2html": "^2.7",
"npm-asset/as-jqplot" : "1.0.*", "npm-asset/as-jqplot" : "1.0.*",
"npm-asset/gridster":"0.5.*", "npm-asset/gridster":"0.5.*",
"adldap2/adldap2": "=4.0.4", "adldap2/adldap2": "=4.0.4",
@ -87,7 +86,7 @@
"egroupware/z-push-dev": "self.version", "egroupware/z-push-dev": "self.version",
"egroupware/activesync": "self.version", "egroupware/activesync": "self.version",
"egroupware/adodb-php": "self.version", "egroupware/adodb-php": "self.version",
"pear-pear.horde.org/Horde_Text_Diff": "^2.2", "pear-pear.horde.org/horde_text_diff": "^2.2",
"bower-asset/diff2html": "^2.7" "bower-asset/diff2html": "^2.7"
}, },
"require-dev": { "require-dev": {

9
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "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": "2b00ad598700859fd0600f10fd8967bb", "content-hash": "6b5e48d4c7a990d1eefd0217bc9f1bec",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -787,12 +787,15 @@
"php": ">=5.4.0" "php": ">=5.4.0"
}, },
"type": "library", "type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"AGPL-3.0" "AGPL-3.0"
], ],
"description": "Z-Push is an open-source application to synchronize ActiveSync compatible devices", "description": "Z-Push is an open-source application to synchronize ActiveSync compatible devices",
"homepage": "http://z-push.org/", "homepage": "http://z-push.org/",
"support": {
"source": "https://github.com/EGroupware/z-push/tree/master",
"issues": "https://github.com/EGroupware/z-push/issues"
},
"time": "2019-02-11T19:26:21+00:00" "time": "2019-02-11T19:26:21+00:00"
}, },
{ {