Merge remote-tracking branch 'upstream/master'
Showing
- bower.json 2 additions, 1 deletionbower.json
- doc/fr/development_tutorial-02.md 1 addition, 1 deletiondoc/fr/development_tutorial-02.md
- doc/fr/development_tutorial-04.md 40 additions, 20 deletionsdoc/fr/development_tutorial-04.md
- doc/fr/development_tutorial-05.md 72 additions, 0 deletionsdoc/fr/development_tutorial-05.md
- gulpfile.js 1 addition, 3 deletionsgulpfile.js
- www/i18n/locale-en-GB.json 15 additions, 12 deletionswww/i18n/locale-en-GB.json
- www/i18n/locale-en.json 15 additions, 12 deletionswww/i18n/locale-en.json
- www/i18n/locale-es-ES.json 13 additions, 9 deletionswww/i18n/locale-es-ES.json
- www/i18n/locale-fr-FR.json 15 additions, 13 deletionswww/i18n/locale-fr-FR.json
- www/index.html 7 additions, 0 deletionswww/index.html
- www/js/app.js 23 additions, 6 deletionswww/js/app.js
- www/js/config.js 18 additions, 19 deletionswww/js/config.js
- www/js/controllers/app-controllers.js 1 addition, 3 deletionswww/js/controllers/app-controllers.js
- www/js/controllers/blockchain-controllers.js 5 additions, 6 deletionswww/js/controllers/blockchain-controllers.js
- www/js/controllers/currency-controllers.js 21 additions, 125 deletionswww/js/controllers/currency-controllers.js
- www/js/controllers/help-controllers.js 24 additions, 15 deletionswww/js/controllers/help-controllers.js
- www/js/controllers/join-controllers.js 80 additions, 42 deletionswww/js/controllers/join-controllers.js
- www/js/controllers/network-controllers.js 3 additions, 3 deletionswww/js/controllers/network-controllers.js
- www/js/controllers/settings-controllers.js 4 additions, 1 deletionwww/js/controllers/settings-controllers.js
- www/js/plugins.js 2 additions, 1 deletionwww/js/plugins.js
Loading
Please register or sign in to comment