Merge branch 'develop' into forward_message
This commit is contained in:
commit
7676fd960e
13 changed files with 67 additions and 52 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -13,4 +13,4 @@ npm-debug.log
|
|||
electron/dist
|
||||
electron/pub
|
||||
/.idea
|
||||
config.json
|
||||
/config.json
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue