Merge branch 'devel_11.1.x-clean' (7f1472b1) · 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

7f1472b1

There was a problem fetching the pipeline mini graph.

Commit 7f1472b1 authored 6 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'devel_11.1.x-clean'

parents fc57b419 390c28b6

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 6
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 11 additions, 1 deletion

CHANGELOG
frontend-js/src/main/js/gui/AddOverlayDialog.js 6 additions, 3 deletions

frontend-js/src/main/js/gui/AddOverlayDialog.js
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js 5 additions, 2 deletions

frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
persist/src/db/11.1.1/fix_db_20180626.sql 1 addition, 0 deletions

persist/src/db/11.1.1/fix_db_20180626.sql
service/src/main/java/lcsb/mapviewer/services/impl/UserService.java 21 additions, 16 deletions

...c/main/java/lcsb/mapviewer/services/impl/UserService.java
web/src/main/webapp/resources/other/admin_guide.pdf 0 additions, 0 deletions

web/src/main/webapp/resources/other/admin_guide.pdf

with 44 additions and 22 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