Explorar el Código

Merge branch 'master' into dev-sb-strucmotifwizard

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
JonStargaryen hace 4 años
padre
commit
8ba41ebc40
Se han modificado 2 ficheros con 6 adiciones y 2 borrados
  1. 4 0
      CHANGELOG.md
  2. 2 2
      package.json

+ 4 - 0
CHANGELOG.md

@@ -6,6 +6,10 @@
 ### General
 - structural motif search wizard
 
+## [1.0.35] - 2021-02-08
+### General
+- Mol* 1.3.0
+
 ## [1.0.34] - 2021-02-05
 ### General
 - bumps dependencies

+ 2 - 2
package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rcsb/rcsb-molstar",
-    "version": "1.0.34",
+    "version": "1.0.35",
     "description": "RCSB PDB apps and props based on Mol*.",
     "homepage": "https://github.com/rcsb/rcsb-molstar#readme",
     "repository": {
@@ -48,7 +48,7 @@
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^6.2.0",
         "mini-css-extract-plugin": "^1.3.2",
-        "molstar": "^1.2.15",
+        "molstar": "^1.3.0",
         "node-sass": "^5.0.0",
         "raw-loader": "^4.0.2",
         "react": "^17.0.1",