Skip to content
Snippets Groups Projects
Commit d1d0f91b authored by vkovtun's avatar vkovtun
Browse files

Merge branch 'master' into ssdm-8226-replace-hibernate-search-query-engine

# Conflicts:
#	openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls
parents 7bcf6b64 ab56d094
No related branches found
No related tags found
Loading
Showing
with 37 additions and 15 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 to comment