Merge branch 'master' into 'patch-19'
# Conflicts: # www/i18n/locale-eo-EO.json
Showing
- .bowerrc 0 additions, 3 deletions.bowerrc
- .gitignore 2 additions, 0 deletions.gitignore
- .run/Cesium.run.xml 6 additions, 0 deletions.run/Cesium.run.xml
- Dockerfile 28 additions, 77 deletionsDockerfile
- README.md 17 additions, 80 deletionsREADME.md
- app/config.json 68 additions, 28 deletionsapp/config.json
- bower.json 16 additions, 15 deletionsbower.json
- config.xml 17 additions, 8 deletionsconfig.xml
- dist/desktop 1 addition, 1 deletiondist/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 2 additions, 0 deletionsdoc/build_docker.md
- doc/build_ios.md 2 additions, 2 deletionsdoc/build_ios.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.4.3.md 1 addition, 1 deletiondoc/changelog/changelog_v1.4.3.md
- doc/changelog/changelog_v1.5.3.md 2 additions, 3 deletionsdoc/changelog/changelog_v1.5.3.md
- doc/changelog/changelog_v1.6.0.md 25 additions, 0 deletionsdoc/changelog/changelog_v1.6.0.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
Loading
Please register or sign in to comment