Permalink
Browse files

Merge branch 'master' of https://github.com/AdventurePHP/code

Conflicts:
	modules/usermanagement/biz/model/UmgtUserBase.php
  • Loading branch information...
Christian Achatz
Christian Achatz committed Jan 19, 2016
2 parents dc74dbb + 4873987 commit fa7e953ad5020a4e1722913fb11e9a18f38239f3
Showing with 0 additions and 0 deletions.

0 comments on commit fa7e953

Please sign in to comment.