Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

vMap
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

d0d9f34c

Commit d0d9f34c authored Nov 27, 2018 by Armand Bahi

Downloads
- Plain Diff

Merge branch 'next_version' into 'pre-2018.04.00'

Next version

See merge request Development/vitis_apps/application/vmap!24

parents f2ed068a 3833017d

Branches

Tags

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

client/templates/mainTpl.html 4 additions, 4 deletions

client/templates/mainTpl.html
vas/rest/conf/selected_properties.inc 2 additions, 0 deletions

vas/rest/conf/selected_properties.inc
vas/rest/ws/vitis/Properties.class.inc 7 additions, 1 deletion

vas/rest/ws/vitis/Properties.class.inc

with 13 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment