You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@syncope.apache.org by il...@apache.org on 2015/02/13 13:07:20 UTC

[5/5] syncope git commit: Merge branch 'master' into 2_0_X

Merge branch 'master' into 2_0_X

Conflicts:
	core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/094e68f3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/094e68f3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/094e68f3

Branch: refs/heads/2_0_X
Commit: 094e68f3744f78142bbfa856deb89e9406000211
Parents: 2d19463 36327a9
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Feb 13 13:06:48 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Feb 13 13:06:48 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------