Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics

# Conflicts:
#	extensions/ohif-vtk-extension/package.json
#	extensions/ohif-vtk-extension/rollup.config.js
#	extensions/ohif-vtk-extension/yarn.lock
#	package.json
#	src/App.js
#	src/components/Header/Header.js
#	yarn.lock
This commit is contained in:
romulo bordezani committed 2019-06-10 14:54:18 -03:00
1 parent 0753e9ec3c
commit d5909f8d74
9 files changed
+39 -10

No files matched your search

+1 -1
View File
@@ -96,7 +96,7 @@
"react-resize-detector": "^3.4.0",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-viewerbase": "0.7.0",
"react-viewerbase": "file:.yalc/react-viewerbase",
"react-vtkjs-viewport": "^0.0.7",
"redux": "^4.0.1",
"redux-oidc": "3.1.x"