Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:monarc-project/MonarcAppFO

pull/255/head
Cédric Bonhomme 2019-11-21 08:32:22 +01:00
parent f9bbc2ac7d 228379c290
commit 5b1f2d4397
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -16,7 +16,7 @@
"php": "^7.1", "php": "^7.1",
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"monarc/frontoffice": "~2.9", "monarc/frontoffice": "dev-master",
"zendframework/zend-mvc": "^3.1", "zendframework/zend-mvc": "^3.1",
"zendframework/zend-di": "^3.1", "zendframework/zend-di": "^3.1",
"zendframework/zend-permissions-rbac": "^3.0", "zendframework/zend-permissions-rbac": "^3.0",

21
composer.lock generated
View File

@ -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": "a6c747567731a714418e430190fda016", "content-hash": "5377926879625fef4e42f7e516bee26f",
"packages": [ "packages": [
{ {
"name": "cakephp/cache", "name": "cakephp/cache",
@ -1471,12 +1471,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/monarc-project/zm-core.git", "url": "https://github.com/monarc-project/zm-core.git",
"reference": "60ddfb24bdd29f362a6d71dca279cbc8b7ed83fe" "reference": "a0da4dad5823ea3ef34236fb1286e2b046ddb6c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/60ddfb24bdd29f362a6d71dca279cbc8b7ed83fe", "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/a0da4dad5823ea3ef34236fb1286e2b046ddb6c6",
"reference": "60ddfb24bdd29f362a6d71dca279cbc8b7ed83fe", "reference": "a0da4dad5823ea3ef34236fb1286e2b046ddb6c6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1547,20 +1547,20 @@
} }
], ],
"description": "Core for monarc/monarc application", "description": "Core for monarc/monarc application",
"time": "2019-11-20T11:05:31+00:00" "time": "2019-11-20T14:20:20+00:00"
}, },
{ {
"name": "monarc/frontoffice", "name": "monarc/frontoffice",
"version": "2.9.1", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/monarc-project/zm-client.git", "url": "https://github.com/monarc-project/zm-client.git",
"reference": "9feb6b8d1acaab8d9579f65f0e1d81d522636ace" "reference": "73744d4f53de4fbd125ea5658fe2aa2bcadb1357"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/9feb6b8d1acaab8d9579f65f0e1d81d522636ace", "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/73744d4f53de4fbd125ea5658fe2aa2bcadb1357",
"reference": "9feb6b8d1acaab8d9579f65f0e1d81d522636ace", "reference": "73744d4f53de4fbd125ea5658fe2aa2bcadb1357",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1626,7 +1626,7 @@
} }
], ],
"description": "Frontoffice for monarc/monarc application", "description": "Frontoffice for monarc/monarc application",
"time": "2019-11-19T14:55:05+00:00" "time": "2019-11-20T09:22:19+00:00"
}, },
{ {
"name": "monarc/phpword", "name": "monarc/phpword",
@ -5069,6 +5069,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"monarc/frontoffice": 20,
"roave/security-advisories": 20 "roave/security-advisories": 20
}, },
"prefer-stable": false, "prefer-stable": false,