Merge conflicts

mui · Feb 3, 2020 · a597ab0 · a597ab0
2 parents f4bc58f + c7409f3
commit a597ab0
Show file tree

Hide file tree

Showing 4 changed files with 2,073 additions and 95 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -17,8 +17,8 @@
     "node": "12.x"
   },
   "dependencies": {
-    "@babel/plugin-proposal-optional-chaining": "^7.7.4",
-    "@date-io/hijri": "^1.3.8",
+    "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+    "@date-io/hijri": "^2.2.0",
     "@date-io/jalaali": "^2.0.0",
     "@mapbox/rehype-prism": "^0.3.1",
     "@material-ui/core": "^4.5.1",
@@ -49,7 +49,7 @@
     "material-ui-search-bar": "^1.0.0-beta.13",
     "moment": "^2.24.0",
     "moment-hijri": "^2.1.2",
-    "moment-jalaali": "^0.8.3",
+    "moment-jalaali": "^0.9.1",
     "next": "8.0.4",
     "next-cookies": "1.1.0",
     "next-images": "^1.0.4",