Merge branch 'master' into 100-export-should-use-api (7d183a53) · Commits · minerva / core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

7d183a53

Commit 7d183a53 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'master' into 100-export-should-use-api

parents 58cc3f4e 146f96ce

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

persist/src/db/11/fix_db_20170714.sql 18 additions, 0 deletions

persist/src/db/11/fix_db_20170714.sql
rest-api/src/main/java/lcsb/mapviewer/api/ContentNegotiationConfig.java 32 additions, 0 deletions

...ain/java/lcsb/mapviewer/api/ContentNegotiationConfig.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java 1 addition, 1 deletion

...n/java/lcsb/mapviewer/api/projects/ProjectController.java
rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java 1 addition, 1 deletion

...rc/main/java/lcsb/mapviewer/api/users/UserController.java

with 52 additions and 2 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