Merge branch 'master' into 'scanlegentil-master-patch-60356'
# Conflicts: # www/i18n/locale-es-ES.json
Showing
- .bowerrc 0 additions, 3 deletions.bowerrc
- .gitignore 19 additions, 15 deletions.gitignore
- .gitlab-ci.yml 21 additions, 21 deletions.gitlab-ci.yml
- .gitmodules 3 additions, 3 deletions.gitmodules
- .yarnrc 1 addition, 0 deletions.yarnrc
- Dockerfile 30 additions, 74 deletionsDockerfile
- README.md 37 additions, 104 deletionsREADME.md
- app/config.json 94 additions, 97 deletionsapp/config.json
- bower.json 0 additions, 35 deletionsbower.json
- build.json 18 additions, 0 deletionsbuild.json
- config.xml 90 additions, 42 deletionsconfig.xml
- dist/desktop 1 addition, 0 deletionsdist/desktop
- doc/build_android.md 2 additions, 2 deletionsdoc/build_android.md
- doc/build_desktop.md 7 additions, 0 deletionsdoc/build_desktop.md
- doc/build_docker.md 4 additions, 8 deletionsdoc/build_docker.md
- doc/build_ios.md 153 additions, 3 deletionsdoc/build_ios.md
- doc/build_ubuntu.md 0 additions, 109 deletionsdoc/build_ubuntu.md
- doc/build_web.md 26 additions, 0 deletionsdoc/build_web.md
- doc/build_web_extension.md 51 additions, 0 deletionsdoc/build_web_extension.md
- doc/changelog/changelog_v1.2.10.md 4 additions, 9 deletionsdoc/changelog/changelog_v1.2.10.md
Loading
Please register or sign in to comment