fixed merge conflicts

Author: briancaffey

backend/requirements/base.txt

@@ -21,7 +21,7 @@ gevent==20.9.0
 
 # Python Social Auth
 
-social-auth-app-django==3.1.0
+social-auth-app-django==3.4.0
 social-auth-core==3.3.3
 
 # Django page caching is not working with this version of Redis
@@ -40,4 +40,4 @@ psycopg2-binary==2.8.6
 
 redis==3.5.3
 
-requests==2.23.0
+requests==2.24.0

documentation/package.json

@@ -6,8 +6,8 @@
     "local": "nodemon --ext md,vue --watch .vuepress --watch . --exec vuepress dev docs"
   },
   "dependencies": {
-    "vuepress": "1.5.0",
-    "@vuepress/plugin-google-analytics": "1.5.0"
+    "vuepress": "1.7.1",
+    "@vuepress/plugin-google-analytics": "1.7.1"
   },
   "devDependencies": {
     "nodemon": "2.0.6"

quasar/package.json

@@ -21,17 +21,17 @@
     "emoji-mart-vue": "2.6.6",
     "graphql": "15.3.0",
     "graphql-tag": "2.11.0",
-    "highcharts": "8.1.0",
+    "highcharts": "8.2.2",
     "highcharts-vue": "1.3.5",
     "js-cookie": "2.2.1",
-    "prettier": "2.0.5",
+    "prettier": "2.1.2",
     "quasar": "1.14.2",
-    "vue-apollo": "3.0.3",
+    "vue-apollo": "3.0.5",
     "vue-i18n": "8.22.1",
     "vue-native-websocket": "2.0.14"
   },
   "devDependencies": {
-    "@quasar/app": "1.9.6",
+    "@quasar/app": "2.1.5",
     "@vue/eslint-config-prettier": "6.0.0",
     "babel-eslint": "10.1.0",
     "eslint": "7.12.0",