From: riqo <hernandeze2@xavier.edu>
Date: Tue, 13 Apr 2021 12:29:24 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/main'
X-Git-Tag: v0.9.0~3
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=df01258dfce30ca8f98965e4a92d6ebbaf6d2228;p=mime-chat

Merge remote-tracking branch 'origin/main'
---

df01258dfce30ca8f98965e4a92d6ebbaf6d2228
diff --cc package.json
index 587010a,852a3e9..582b731
--- a/package.json
+++ b/package.json
@@@ -7,18 -7,14 +7,24 @@@
    "author": {
      "name": "Enrique Hernandez"
    },
 -  "main": "background.js",
 +  "main": "./src/background.ts",
    "scripts": {
 +    "dev": "yarn electron:serve",
 +    "serve": "vue-cli-service serve",
 +    "build": "vue-cli-service build",
 +    "test:unit": "vue-cli-service test:unit",
 +    "lint": "vue-cli-service lint",
 +    "electron:build": "vue-cli-service electron:build",
 +    "electron:serve": "vue-cli-service electron:serve",
 +    "postinstall": "electron-builder install-app-deps",
 +    "postuninstal": "electron-builder install-app-deps",
-     "dist":"electron-builder --publish always"
++    "dist":"electron-builder --publish always",
+     "dev": "vue-cli-service electron:serve",
+     "build": "vue-cli-service electron:build"
+   },
+   "repository": {
+     "type" : "git",
+     "url" : "https://gitlab.com/crimata/electron-app.git"
    },
    "dependencies": {
      "@google-cloud/speech": "^4.2.0",