Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

75bbe42b

Commit 75bbe42b authored 6 years ago by Anthony Borghi

Downloads
- Plain Diff

Merge branch 'master' into 'next_version'

Master into next_version

See merge request Development/vitis_apps/application/gtf!14

parents e618a214 ff4f68a2

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

module/javascript/script_module.js 3 additions, 1 deletion

module/javascript/script_module.js
module/lang/lang-en.json 2 additions, 1 deletion

module/lang/lang-en.json
module/lang/lang-fr.json 2 additions, 1 deletion

module/lang/lang-fr.json
web_service/class/gtf_lib/gtf_object/Order.class.inc 7 additions, 8 deletions

web_service/class/gtf_lib/gtf_object/Order.class.inc
web_service/ws/License.class.inc 74 additions, 54 deletions

web_service/ws/License.class.inc
web_service/ws/UserOrders.class.inc 1 addition, 8 deletions

web_service/ws/UserOrders.class.inc

with 89 additions and 73 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