Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openbis
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

c266f90f

Commit c266f90f authored 1 year ago by vkovtun

Downloads
- Plain Diff

Merge branch 'refs/heads/master' into ssdm-13579-dss-widget

parents 08b2f646 2b24a580

No related branches found

No related tags found

1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java 45 additions, 15 deletions

.../server/xls/importer/delay/DelayedExecutionDecorator.java
server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/ImportUtils.java 1 addition, 1 deletion

...penbis/generic/server/xls/importer/utils/ImportUtils.java
ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js 0 additions, 1 deletion

...lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

with 46 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment