Skip to content
Snippets Groups Projects
Commit 64d16013 authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'ui-sprint-2' into dev 

 Conflicts:
	fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCSVInformation.java
	fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java
	fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java
	fda-table-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
	fda-table-service/services/src/main/java/at/tuwien/service/PostgresService.java
	fda-table-service/services/src/main/java/at/tuwien/service/TableService.java
	fda-ui/Dockerfile


Former-commit-id: 6fd3e083
parents a077e307 19fe75f8
No related branches found
No related tags found
1 merge request!23Sprint results
Hide whitespace changes
Inline Side-by-side
Showing
with 584 additions and 111 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment