Merge branch 'master' into feature/startup_node_selection
# Conflicts: # app/config.json # dist/desktop # www/license/license_g1-es-ES.md # www/license/license_g1-it-IT.md
No related branches found
No related tags found
Checking pipeline status
Showing
- app/config.json 10 additions, 9 deletionsapp/config.json
- config.xml 1 addition, 1 deletionconfig.xml
- dist/desktop 1 addition, 1 deletiondist/desktop
- doc/changelog/changelog_v1.7.0.md 6 additions, 0 deletionsdoc/changelog/changelog_v1.7.0.md
- gulpfile.js 3 additions, 3 deletionsgulpfile.js
- install.sh 1 addition, 1 deletioninstall.sh
- package.json 1 addition, 1 deletionpackage.json
- resources/flag/flag-ca.svg 0 additions, 0 deletionsresources/flag/flag-ca.svg
- resources/flag/flag-ca.xcf 0 additions, 0 deletionsresources/flag/flag-ca.xcf
- resources/flag/flag-ct.svg 4 additions, 0 deletionsresources/flag/flag-ct.svg
- resources/flag/flag-ct.xcf 0 additions, 0 deletionsresources/flag/flag-ct.xcf
- resources/flag/flag-de.svg 5 additions, 0 deletionsresources/flag/flag-de.svg
- resources/flag/flag-de.xcf 0 additions, 0 deletionsresources/flag/flag-de.xcf
- resources/flag/flag-pt.svg 57 additions, 0 deletionsresources/flag/flag-pt.svg
- resources/flag/flag-pt.xcf 0 additions, 0 deletionsresources/flag/flag-pt.xcf
- resources/web-ext/manifest.json 1 addition, 1 deletionresources/web-ext/manifest.json
- ubuntu-bionic-18.04-cloudimg-console.log 611 additions, 0 deletionsubuntu-bionic-18.04-cloudimg-console.log
- www/i18n/locale-de-DE.json 1041 additions, 0 deletionswww/i18n/locale-de-DE.json
- www/i18n/locale-en-GB.json 18 additions, 0 deletionswww/i18n/locale-en-GB.json
- www/i18n/locale-en.json 18 additions, 0 deletionswww/i18n/locale-en.json
Loading
Please register or sign in to comment