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/16 14:44:22 UTC

[3/3] syncope git commit: Merge branch '1_2_X'

Merge branch '1_2_X'

Conflicts:
	core/src/test/resources/content.xml


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

Branch: refs/heads/master
Commit: 64ed630c89e767a62fd348e0e9c21c21db330e91
Parents: b0e02f0 4dc90d7
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:44:11 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:44:11 2015 +0100

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

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