Merge branch 'master' into develop (9a5ca1a6) · Commits · clients / Cesium-grp / Cesium · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Cesium
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

9a5ca1a6

Commit 9a5ca1a6 authored 3 years ago by Benoit Lavenier

Downloads
- Plain Diff

Merge branch 'master' into develop

# Conflicts:
#	www/js/config.js

parents b4c4bda2 55da21f3

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

config.xml 1 addition, 1 deletion

config.xml
install.sh 1 addition, 1 deletion

install.sh
package.json 1 addition, 1 deletion

package.json
resources/web-ext/manifest.json 1 addition, 1 deletion

resources/web-ext/manifest.json
scss/ionic.app.scss 4 additions, 0 deletions

scss/ionic.app.scss
www/js/config.js 3 additions, 3 deletions

www/js/config.js
www/js/services/device-services.js 5 additions, 5 deletions

www/js/services/device-services.js
www/license/license_g1-pt-PT.md 97 additions, 0 deletions

www/license/license_g1-pt-PT.md
www/manifest.json 1 addition, 1 deletion

www/manifest.json
www/templates/login/popover_methods.html 1 addition, 1 deletion

www/templates/login/popover_methods.html

with 115 additions and 14 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