Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

d2df37f8

Commit d2df37f8 authored 6 years ago by Armand Bahi

Downloads
- Plain Diff

Merge branch 'master' into app_vmap

parents b634a81c f9684689

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

client/modules/vitis/forms/user/user_vitis_user.json 6 additions, 4 deletions

client/modules/vitis/forms/user/user_vitis_user.json
client/modules/vitis/lang/lang-en.json 1 addition, 0 deletions

client/modules/vitis/lang/lang-en.json
client/modules/vitis/lang/lang-fr.json 1 addition, 0 deletions

client/modules/vitis/lang/lang-fr.json
vas/rest/index.vhtml 6 additions, 2 deletions

vas/rest/index.vhtml
vas/rest/ws/vitis/FileDownloader.class.inc 4 additions, 2 deletions

vas/rest/ws/vitis/FileDownloader.class.inc
vas/rest/ws/vitis/Users.class.inc 9 additions, 0 deletions

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

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