- Downloads
Merge branch 'annotation-on-video' into 17-8-open-an-other-manifest-side-by-side-from-an-annotation
# Conflicts: # package.json
Showing
- src/locales/it/translation.json 8 additions, 8 deletionssrc/locales/it/translation.json
- src/locales/ja/translation.json 4 additions, 4 deletionssrc/locales/ja/translation.json
- src/locales/kr/translation.json 8 additions, 8 deletionssrc/locales/kr/translation.json
- src/locales/lt/translation.json 4 additions, 4 deletionssrc/locales/lt/translation.json
- src/locales/nbNo/translation.json 8 additions, 8 deletionssrc/locales/nbNo/translation.json
- src/locales/nl/translation.json 8 additions, 8 deletionssrc/locales/nl/translation.json
- src/locales/pl/translation.json 8 additions, 8 deletionssrc/locales/pl/translation.json
- src/locales/ptBr/translation.json 2 additions, 2 deletionssrc/locales/ptBr/translation.json
- src/locales/sr/translation.json 4 additions, 4 deletionssrc/locales/sr/translation.json
- src/locales/sv/translation.json 4 additions, 4 deletionssrc/locales/sv/translation.json
- src/locales/vi/translation.json 5 additions, 5 deletionssrc/locales/vi/translation.json
- src/locales/zhCn/translation.json 8 additions, 8 deletionssrc/locales/zhCn/translation.json
- src/locales/zhTw/translation.json 8 additions, 8 deletionssrc/locales/zhTw/translation.json
- src/polyfills.js 0 additions, 2 deletionssrc/polyfills.js
- src/state/actions/workspace.js 0 additions, 10 deletionssrc/state/actions/workspace.js
- src/state/sagas/iiif.js 0 additions, 1 deletionsrc/state/sagas/iiif.js
- webpack.config.js 2 additions, 0 deletionswebpack.config.js
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please sign in to comment