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

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

ldap
Juan Rocha 2019-03-19 14:44:07 +01:00
parent 7cfee67d93 2253f163a7
commit 82679725e5
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/autoload/local.php.dist
View File

@ -75,13 +75,13 @@ return array(
'index' => 3,
'label' => 'Deutsch'
),
'ne' => array(
'nl' => array(
'index' => 4,
'label' => 'Nederlands',
),
]
*/
'activeLanguages' => array('fr','en','de','ne',),
'activeLanguages' => array('fr','en','de','nl',),
'appVersion' => $package_json['version'],

4
package.json
View File

@ -14,7 +14,7 @@
"ng_client": "https://github.com/monarc-project/ng-client#master"
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-cli": "~0.1.13"
"grunt": "~1.0.3",
"grunt-cli": "~1.3.2"
}
}

30
packages.json
View File

@ -1,30 +0,0 @@
{
"packages": {
"monarc/skeleton": {
"dev-master": {
"name": "monarc/skeleton",
"type": "library",
"version": "dev-master",
"description": "Skeleton for Monarc project",
"authors": [
{"name": "Cyril Rouyer", "email": "cyril@netlor.fr"},
{"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"},
{"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"},
{"name": "Benjamin Ganivet", "email": "benjamin@netlor.fr"},
{"name": "Thomas Metois", "email": "thomas@netlor.fr"},
{"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"},
{"name": "Juan Rocha", "email": "juan.rocha@cases.lu"},
{"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"}
],
"require": {
"php": ">=5.5"
},
"source": {
"url": "https://github.com/monarc-project/skeleton",
"type": "git",
"reference": "master"
}
}
}
}
}