Merge remote-tracking branch 'upstream/master'
# Conflicts: # www/css/ionic.app.min.css
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 2 deletions.gitignore
- app/config.json 10 additions, 4 deletionsapp/config.json
- ionic.project 3 additions, 1 deletionionic.project
- www/css/ionic.app.css 0 additions, 15151 deletionswww/css/ionic.app.css
- www/i18n/locale-en-GB.json 1 addition, 1 deletionwww/i18n/locale-en-GB.json
- www/i18n/locale-en.json 1 addition, 1 deletionwww/i18n/locale-en.json
- www/i18n/locale-es-ES.json 1 addition, 1 deletionwww/i18n/locale-es-ES.json
- www/i18n/locale-fr-FR.json 1 addition, 1 deletionwww/i18n/locale-fr-FR.json
- www/i18n/locale-nl-NL.json 1 addition, 1 deletionwww/i18n/locale-nl-NL.json
- www/index.html 10 additions, 6 deletionswww/index.html
- www/js/app.js 1 addition, 0 deletionswww/js/app.js
- www/js/config.js 7 additions, 16 deletionswww/js/config.js
- www/js/controllers/wallet-controllers.js 5 additions, 4 deletionswww/js/controllers/wallet-controllers.js
- www/js/services/tx-services.js 22 additions, 16 deletionswww/js/services/tx-services.js
- www/plugins/es/css/style.css 0 additions, 49 deletionswww/plugins/es/css/style.css
- www/plugins/es/js/controllers/app-controllers.js 0 additions, 8 deletionswww/plugins/es/js/controllers/app-controllers.js
- www/plugins/es/js/controllers/market-controllers.js 0 additions, 802 deletionswww/plugins/es/js/controllers/market-controllers.js
- www/plugins/es/js/services/comment-services.js 4 additions, 3 deletionswww/plugins/es/js/services/comment-services.js
- www/plugins/es/js/services/market-services.js 0 additions, 231 deletionswww/plugins/es/js/services/market-services.js
- www/plugins/es/templates/common/item_comment_content.html 7 additions, 8 deletionswww/plugins/es/templates/common/item_comment_content.html
Loading
Please register or sign in to comment