Commit 1fffade

committed

Merge branch 'dev' into justin/screen_recording

2 parents d3d989e + 3d20c18 commit 1fffadeCopy full SHA for 1fffade

2 files changed

chronos_npm_package
- package-lock.json
electron/models
- UserModel.ts

Comments

(0)