Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

5db27a12

Commit 5db27a12 authored 6 years ago by Armand Bahi

Downloads
- Patches
- Plain Diff

Merge branch 'next_version' into evolution/60-ajout-de-plusieurs-documents-simultanes

parent cc50eb39

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

client/css/icons/style.css 3 additions, 0 deletions

client/css/icons/style.css
client/javascript/externs/mapJSON/MapJSON.js 5 additions, 2 deletions

client/javascript/externs/mapJSON/MapJSON.js
vas/rest/class/vmlib/files/Files_manager.class.inc 1 addition, 1 deletion

vas/rest/class/vmlib/files/Files_manager.class.inc
vas/rest/conf/properties_server.inc 1 addition, 1 deletion

vas/rest/conf/properties_server.inc

with 10 additions and 4 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