Skip to content
Snippets Groups Projects
Commit d1770eb9 authored by Cornelia Michlits's avatar Cornelia Michlits
Browse files

Merge branch '84-search-service' into dev

# Conflicts:
#	fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
#	fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
#	fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
#	fda-table-service/rest-service/src/main/resources/application-docker.yml
#	fda-table-service/rest-service/src/main/resources/application.yml
#	fda-table-service/services/src/main/java/at/tuwien/service/TableService.java


Former-commit-id: 0f9801f0
parents 113a39e1 d6a34b41
Branches
Tags
1 merge request!42Fixed the query service tests
Showing
with 134 additions and 6 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment