Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Nov 30, 2015 · fb02017 · fb02017
2 parents b23be2b + 74b8115
commit fb02017
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config/initial-objects/090-report-audit.xml b/config/initial-objects/090-report-audit.xml
diff --git a/config/initial-objects/110-report-user-list.xml b/config/initial-objects/110-report-user-list.xml
diff --git a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
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