Skip to content

Commit

Permalink
Merge branch 'popout'
Browse files Browse the repository at this point in the history
  • Loading branch information
GypsyDangerous committed Jul 30, 2020
2 parents 8e1b996 + 9a44ffe commit de25860
Show file tree
Hide file tree
Showing 23 changed files with 1,756 additions and 861 deletions.
226 changes: 133 additions & 93 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "disstreamchat",
"version": "v1.2.13",
"version": "v1.3.0",
"description": "Cross platform stream chat manager",
"author": "David Snyder",
"license": "MIT",
Expand All @@ -20,10 +20,10 @@
"@material-ui/core": "^4.9.14",
"@material-ui/icons": "^4.9.1",
"bootstrap": "^4.4.1",
"chatbits": "^1.1.2-hotfix1",
"chroma-js": "^2.1.0",
"cross-env": "^6.0.3",
"custom-electron-titlebar": "^3.2.2-hotfix62",
"distwitchchat-componentlib": "^2.1.8-hotfix1",
"dompurify": "^2.0.10",
"electron-context-menu": "^2.1.0",
"electron-is-dev": "^1.1.0",
Expand Down
Loading

0 comments on commit de25860

Please sign in to comment.