Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-08-06 19:11:06 +00:00
commit ed9a4a3933

2
.gitignore vendored
View file

@ -14,6 +14,6 @@
npm-debug.log npm-debug.log
electron/dist electron/dist
electron/pub electron/pub
/.idea **/.idea
/config.json /config.json
/src/component-index.js /src/component-index.js