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

Browse Source

# 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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/latest/assets/img/ohif-i18n-extending-files-tree.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB