Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history 
# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties
  • Loading branch information
@PetrGasparik
PetrGasparik committed Sep 10, 2017
2 parents 7e409fa + 970cfba commit 17d766e
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 17d766e

Please sign in to comment.