Merge branch 'master' into 'spanish-translation'
# Conflicts: # www/plugins/es/i18n/locale-es-ES.json
Showing
- .bowerrc 0 additions, 3 deletions.bowerrc
- Dockerfile 28 additions, 77 deletionsDockerfile
- bower.json 16 additions, 15 deletionsbower.json
- config.xml 16 additions, 7 deletionsconfig.xml
- dist/desktop 1 addition, 1 deletiondist/desktop
- doc/build_ios.md 1 addition, 1 deletiondoc/build_ios.md
- doc/changelog/changelog_v1.6.2.md 53 additions, 0 deletionsdoc/changelog/changelog_v1.6.2.md
- doc/changelog/changelog_v1.6.5.md 10 additions, 0 deletionsdoc/changelog/changelog_v1.6.5.md
- doc/development_guide.md 7 additions, 5 deletionsdoc/development_guide.md
- doc/fr/development_tutorial-01.md 1 addition, 1 deletiondoc/fr/development_tutorial-01.md
- gulpfile.js 12 additions, 7 deletionsgulpfile.js
- hooks/README.md 1 addition, 81 deletionshooks/README.md
- hooks/after_prepare/060_prepare_android_manifest.js 7 additions, 2 deletionshooks/after_prepare/060_prepare_android_manifest.js
- hooks/after_prepare/061_copy_build_extras.js 41 additions, 26 deletionshooks/after_prepare/061_copy_build_extras.js
- hooks/before_prepare/02_jshint.js 85 additions, 72 deletionshooks/before_prepare/02_jshint.js
- install.sh 1 addition, 1 deletioninstall.sh
- locale-fr-FR.json 0 additions, 995 deletionslocale-fr-FR.json
- package.json 66 additions, 57 deletionspackage.json
- platforms/android 1 addition, 1 deletionplatforms/android
- resources/android/Dockerfile 93 additions, 0 deletionsresources/android/Dockerfile
Loading
Please register or sign in to comment