Merge branch 'master' into ssdm-10474-collection-form-views-config
# Conflicts: # openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/common-data-model.xls
No related branches found
No related tags found
Showing
- openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py 1 addition, 0 deletions...dist/core-plugins/eln-lims/1/as/initialize-master-data.py
- openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/common-data-model.xls 0 additions, 0 deletions...e-plugins/eln-lims/1/as/master-data/common-data-model.xls
- openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js 6 additions, 4 deletions...pps/eln-lims/html/js/views/SampleTable/SampleTableView.js
- openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/parsers/excel_to_poi/excel_to_poi.py 6 additions, 1 deletion...vices/xls-import-api/parsers/excel_to_poi/excel_to_poi.py
No preview for this file type
Please register or sign in to comment