Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Mar 18, 2020 · 541eee8 · 541eee8
2 parents eb678e0 + 7841029
commit 541eee8
Show file tree

Hide file tree

Showing 5 changed files with 2,070 additions and 1,937 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml