-
- Downloads
Merge remote-tracking branch 'upstream/master'
# Conflicts: # www/i18n/locale-fr-FR.json # www/js/controllers/network-controllers.js
Showing
- app/config.json 5 additions, 2 deletionsapp/config.json
- bower.json 3 additions, 2 deletionsbower.json
- config.xml 2 additions, 2 deletionsconfig.xml
- doc/fr/development_tutorial-02.md 1 addition, 5 deletionsdoc/fr/development_tutorial-02.md
- doc/utils.md 55 additions, 0 deletionsdoc/utils.md
- install.sh 1 addition, 1 deletioninstall.sh
- package.json 1 addition, 1 deletionpackage.json
- scss/ionic.app.scss 65 additions, 11 deletionsscss/ionic.app.scss
- www/css/ionic.app.css 46 additions, 5 deletionswww/css/ionic.app.css
- www/css/ionic.app.min.css 1 addition, 1 deletionwww/css/ionic.app.min.css
- www/css/style.css 0 additions, 3 deletionswww/css/style.css
- www/i18n/locale-en-GB.json 453 additions, 0 deletionswww/i18n/locale-en-GB.json
- www/i18n/locale-en.json 119 additions, 112 deletionswww/i18n/locale-en.json
- www/i18n/locale-fr-FR.json 47 additions, 39 deletionswww/i18n/locale-fr-FR.json
- www/i18n/locale-nl-NL.json 453 additions, 0 deletionswww/i18n/locale-nl-NL.json
- www/index.html 6 additions, 2 deletionswww/index.html
- www/js/app.js 101 additions, 32 deletionswww/js/app.js
- www/js/components.js 21 additions, 0 deletionswww/js/components.js
- www/js/config.js 18 additions, 14 deletionswww/js/config.js
- www/js/controllers/app-controllers.js 21 additions, 2 deletionswww/js/controllers/app-controllers.js
Loading
Please register or sign in to comment