Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • feature/osx-applesilicon
  • 1.6.5_fixed
  • bugfix/osx-bugfixes
  • bugfix/build-ionic
  • feature/no-member-login-browser
  • feature/macos-support
  • feature/ios-support
  • issue_4
  • issue_780
  • gitlab_migration_1
  • dev
  • rml8
  • v1.6.1
  • v1.6.0
  • v1.5.12
  • v1.5.11
  • v1.5.10
  • v1.5.9
  • v1.5.8
  • v1.5.7
  • v1.5.6
  • v1.5.5
  • v1.5.4
  • v1.5.3
  • v1.5.2
  • v1.5.1
  • v1.4.20
  • v1.4.19
  • v1.4.18
  • v1.4.17
  • v1.4.16
  • v1.4.15
33 results

settings-controllers.js

Forked from clients / Cesium-grp / Cesium
Source project has a limited visibility.
  • CamilleC's avatar
    78ab3337
    Merge remote-tracking branch 'upstream/master' · 78ab3337
    CamilleC authored 
    # Conflicts:
#	scss/ionic.app.scss
#	www/i18n/locale-en.json
#	www/i18n/locale-fr-FR.json
#	www/index.html
#	www/js/controllers/wallet-controllers.js
#	www/js/services/network-services.js
#	www/js/services/wallet-services.js
#	www/plugins/es/js/controllers/settings-controllers.js
    78ab3337
    History
    Merge remote-tracking branch 'upstream/master'
    CamilleC authored 
    # Conflicts:
#	scss/ionic.app.scss
#	www/i18n/locale-en.json
#	www/i18n/locale-fr-FR.json
#	www/index.html
#	www/js/controllers/wallet-controllers.js
#	www/js/services/network-services.js
#	www/js/services/wallet-services.js
#	www/plugins/es/js/controllers/settings-controllers.js