Merge remote-tracking branch 'origin/master' (01d9ee7c) · Commits · bpresles / Cesium · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Cesium
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

01d9ee7c

Commit 01d9ee7c authored 7 years ago by ArnaudCerisier

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	www/plugins/es/i18n/locale-en.json

parents 119c4698 8756de4c

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

www/css/ionic.app.min.css 0 additions, 1 deletion

www/css/ionic.app.min.css
www/js/controllers/blockchain-controllers.js 0 additions, 639 deletions

www/js/controllers/blockchain-controllers.js
www/plugins/es/i18n/locale-en.json 5 additions, 0 deletions

www/plugins/es/i18n/locale-en.json

with 5 additions and 640 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