Merge branch 'develop' into forward_message

This commit is contained in:
Michael Telatynski 2017-04-30 12:35:52 +01:00 committed by GitHub
commit 7676fd960e
13 changed files with 67 additions and 52 deletions

2
.gitignore vendored
View file

@ -13,4 +13,4 @@ npm-debug.log
electron/dist
electron/pub
/.idea
config.json
/config.json