Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

81beb244

Commit 81beb244 authored 6 years ago by Anthony Borghi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next_version' into vitis_stockage_S3

parents 6f9b9a96 4f3da349

No related branches found

No related tags found

No related merge requests found

Changes 6

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
vas/util/printserver/client/map/map.js 27 additions, 7 deletions

vas/util/printserver/client/map/map.js

with 60 additions and 27 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