Merge branch 'devel_12.1.x' into merge-12.1.8 (b3b0d234) · 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

b3b0d234

Commit b3b0d234 authored 6 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'devel_12.1.x' into merge-12.1.8

parents 6e5a023f bb8865c3

No related branches found

No related tags found

2 merge requests!64012.1.8 into master,!639Merge 12.1.8

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 21 additions, 12 deletions

CHANGELOG
frontend-js/src/main/js/ServerConnector.js 1 addition, 2 deletions

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js 1 addition, 1 deletion

frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java 0 additions, 1 deletion

...ain/java/lcsb/mapviewer/services/impl/ProjectService.java
service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java 26 additions, 0 deletions

...java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

with 49 additions and 16 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