Merge branch 'master' into 'spanish-translation-pluginmap'
# Conflicts: # www/plugins/es/i18n/locale-es-ES.json
No related branches found
No related tags found
Showing
- Dockerfile 29 additions, 26 deletionsDockerfile
- config.xml 1 addition, 1 deletionconfig.xml
- doc/build_ios.md 1 addition, 1 deletiondoc/build_ios.md
- doc/changelog/changelog_v1.6.2.md 2 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 1 addition, 1 deletiondoc/development_guide.md
- doc/fr/development_tutorial-01.md 1 addition, 1 deletiondoc/fr/development_tutorial-01.md
- install.sh 1 addition, 1 deletioninstall.sh
- package.json 6 additions, 5 deletionspackage.json
- platforms/android 1 addition, 1 deletionplatforms/android
- resources/web-ext/manifest.json 1 addition, 1 deletionresources/web-ext/manifest.json
- scripts/docker-build.sh 14 additions, 0 deletionsscripts/docker-build.sh
- scripts/docker-start.sh 1 addition, 2 deletionsscripts/docker-start.sh
- scripts/env-android.sh 8 additions, 18 deletionsscripts/env-android.sh
- scripts/env-global.sh 7 additions, 9 deletionsscripts/env-global.sh
- scripts/release-sign-extension.sh 1 addition, 1 deletionscripts/release-sign-extension.sh
- scripts/release-to-github.sh 2 additions, 2 deletionsscripts/release-to-github.sh
- www/i18n/locale-es-ES.json 158 additions, 11 deletionswww/i18n/locale-es-ES.json
- www/i18n/locale-fr-FR.json 2 additions, 2 deletionswww/i18n/locale-fr-FR.json
- www/js/config.js 2 additions, 2 deletionswww/js/config.js
Loading
Please register or sign in to comment