Merge branch 'master' into METACATUI_2_0_BRANCH

Conflicts: metacatui/src/main/webapp/js/models/RegistryModel.js metacatui/src/main/webapp/js/templates/downloadButton.html metacatui/src/main/webapp/js/templates/insertProgress.html metacatui/src/main/webapp/js/themes/knb/templates/developers.html metacatui/src/main/webapp/js/views/RegistryView.js
NCEAS · Nov 17, 2017 · a3c0352 · a3c0352
2 parents 4783281 + 85c3045
commit a3c0352
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 5,642 deletions.
diff --git a/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator-full.js b/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator-full.js
diff --git a/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator-full.min.js b/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator-full.min.js
diff --git a/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator.css b/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator.css
diff --git a/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator.min.css b/metacatui/src/main/webapp/components/annotator/v1.2.9/annotator.min.css
diff --git a/metacatui/src/main/webapp/js/models/RegistryModel.js b/metacatui/src/main/webapp/js/models/RegistryModel.js
diff --git a/metacatui/src/main/webapp/js/templates/downloadButton.html b/metacatui/src/main/webapp/js/templates/downloadButton.html
diff --git a/metacatui/src/main/webapp/js/templates/insertProgress.html b/metacatui/src/main/webapp/js/templates/insertProgress.html