romulo bordezani 0753e9ec3c 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-07 17:55:53 -03:00
..
src	Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics	2019-06-07 17:55:53 -03:00
.babelrc	i18n - extension extraction	2019-06-03 17:56:36 -03:00
.editorconfig	i18n - extension extraction	2019-06-03 17:56:36 -03:00
.gitignore	i18n - extension extraction	2019-06-03 17:56:36 -03:00
LICENSE	i18n - extension extraction	2019-06-03 17:56:36 -03:00
package.json	Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics	2019-06-07 17:55:53 -03:00
rollup.config.js	Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics	2019-06-07 17:55:53 -03:00
yarn.lock	Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics	2019-06-07 17:55:53 -03:00