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

bdac1052

Commit bdac1052 authored 8 years ago by Benoit Lavenier

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into dev

parents 4b4f44b0 fe044cfd

No related branches found

No related tags found

Loading

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

www/i18n/locale-en.json 3 additions, 1 deletion

www/i18n/locale-en.json
www/i18n/locale-fr-FR.json 3 additions, 1 deletion

www/i18n/locale-fr-FR.json
www/js/controllers/currency-controllers.js 5 additions, 1 deletion

www/js/controllers/currency-controllers.js
www/templates/currency/tabs/view_network.html 6 additions, 0 deletions

www/templates/currency/tabs/view_network.html
www/templates/currency/tabs/view_parameters.html 12 additions, 5 deletions

www/templates/currency/tabs/view_parameters.html

with 29 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