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

fixed conflicts

pull/2/head
Cédric Bonhomme 2019-02-28 21:59:56 +01:00
parent 443c721a69 9081ff615d
commit c0896bb9ab
No known key found for this signature in database
GPG Key ID: A1CB94DE57B7A70D
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":7, "hotfix":4} {"major":2, "minor":8, "hotfix":0}

4
composer.json
View File

@ -18,7 +18,9 @@
"robmorgan/phinx": "0.5.*", "robmorgan/phinx": "0.5.*",
"monarc/core": "dev-master", "monarc/core": "dev-master",
"monarc/backoffice": "dev-master", "monarc/backoffice": "dev-master",
"phing/phing": "~2.0" "phing/phing": "~2.0",
"ramsey/uuid": "^3.8",
"ramsey/uuid-doctrine": "^1.5"
}, },
"config": { "config": {
"bin-dir": "bin/" "bin-dir": "bin/"

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "MONARC", "name": "MONARC",
"version": "2.7.4", "version": "2.8.0",
"description": "MONARC back office", "description": "MONARC back office",
"private": true, "private": true,
"repository": { "repository": {

2
vagrant/Vagrantfile vendored
View File

@ -53,7 +53,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# #
# # Use VBoxManage to customize the VM. For example to change memory: # # Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "2048"] vb.customize ["modifyvm", :id, "--memory", "2048"]
vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 18.04 - DEV"] vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 18.04 - DEV - 2019-02-21"]
end end
# #
# View the documentation for the provider you're using for more # View the documentation for the provider you're using for more