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:
commit
0753e9ec3c
47 files changed
+740
-6555
No files matched your search
@@ -47,4 +47,5 @@
|
||||
|
||||
- [Contributing](contributing.md)
|
||||
- [FAQ](frequently-asked-questions.md)
|
||||
- [Roadmap](roadmap.md)
|
||||
- [Help](help.md)
|
||||
Reference in new issue
Block a user