Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

vMap
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

431529f6

Commit 431529f6 authored 6 years ago by Armand Bahi

Downloads
- Plain Diff

Merge branch 'master' into 'next_version'

Merge Master

See merge request Development/vitis_apps/sources/vitis!3

parents 355b5f8b 35163699

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 6 additions, 0 deletions

.gitignore
vas/doc/index.phtml 8 additions, 4 deletions

vas/doc/index.phtml
vas/doc/swagger.php 3 additions, 2 deletions

vas/doc/swagger.php
vas/rest/index.phtml 3 additions, 1 deletion

vas/rest/index.phtml
vas/rest/ws/vitis/Properties.class.inc 13 additions, 13 deletions

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

with 33 additions and 20 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