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-07 17:55:53 -03:00
commit 0753e9ec3c
47 files changed
+740 -6555

No files matched your search

+1
View File
@@ -47,4 +47,5 @@
- [Contributing](contributing.md)
- [FAQ](frequently-asked-questions.md)
- [Roadmap](roadmap.md)
- [Help](help.md)