Merge branch 'master' into develop
Showing
- config.xml 1 addition, 1 deletionconfig.xml
- dist/desktop 1 addition, 1 deletiondist/desktop
- doc/build_android.md 2 additions, 2 deletionsdoc/build_android.md
- doc/build_web.md 2 additions, 2 deletionsdoc/build_web.md
- install.sh 22 additions, 30 deletionsinstall.sh
- ionic.config.json 1 addition, 1 deletionionic.config.json
- package.json 5 additions, 5 deletionspackage.json
- resources/chrome-ext/README.md 5 additions, 0 deletionsresources/chrome-ext/README.md
- resources/chrome-ext/background.js 53 additions, 0 deletionsresources/chrome-ext/background.js
- resources/chrome-ext/manifest.json 41 additions, 0 deletionsresources/chrome-ext/manifest.json
- resources/web-ext/background.js 13 additions, 9 deletionsresources/web-ext/background.js
- resources/web-ext/manifest.json 12 additions, 3 deletionsresources/web-ext/manifest.json
- scripts/env-global.sh 6 additions, 4 deletionsscripts/env-global.sh
- scripts/release-desktop.sh 2 additions, 1 deletionscripts/release-desktop.sh
- scss/ionic.app.scss 9 additions, 0 deletionsscss/ionic.app.scss
- www/i18n/locale-ca.json 5 additions, 1 deletionwww/i18n/locale-ca.json
- www/i18n/locale-de-DE.json 5 additions, 1 deletionwww/i18n/locale-de-DE.json
- www/i18n/locale-en-GB.json 5 additions, 1 deletionwww/i18n/locale-en-GB.json
- www/i18n/locale-en.json 5 additions, 1 deletionwww/i18n/locale-en.json
- www/i18n/locale-eo-EO.json 5 additions, 1 deletionwww/i18n/locale-eo-EO.json
Loading
Please register or sign in to comment