Skip to content
Snippets Groups Projects
Commit 03fa7b55 authored by Armand Bahi's avatar Armand Bahi
Browse files

Correction merge

parent 08a8dd3f
Branches
Tags
No related merge requests found
......@@ -40,12 +40,12 @@
}
},
"framework": {
"branch": "master",
"branch": "next_app_vmap",
"name": "vitis",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/vitis.git"
},
"modules": [{
"branch": "master",
"branch": "next_version",
"name": "module_vmap",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git"
}]
......
{
{% if not client_properties_exists %}
"status": "stable",
"application": "{{application.name}}",
"default_show_sidenav": true,
"widget_public_connect_available": true,
......@@ -18,6 +19,5 @@
"proxy_url": "https://[hostname]{{API_ALIAS}}/v2/proxy/proxy",
"version": "{{application.branch}}",
"build": "{{APP_BUILD}}",
"month_year": "{{MONTH_YEAR}}",
"status": "stable"
"month_year": "{{MONTH_YEAR}}"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment