Commit Graph

2 Commits

Author SHA1 Message Date
romulo bordezani
d5909f8d74 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
2019-06-10 14:54:18 -03:00
João Felipe Medeiros Moreira
42cb8e32c7 Configures hif-vtk-extention to use ohif-i18n for translation and include load more locations 2019-06-07 15:35:54 -03:00