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:48:11 UTC

[5/6] syncope git commit: Merge branch '1_1_X' into 1_2_X

Merge branch '1_1_X' into 1_2_X

Conflicts:
	pom.xml


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

Branch: refs/heads/1_2_X
Commit: 95b6ea59d15045e9cec9e91bfdc8d994873b091d
Parents: fc0c8a6 b88be93
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:47:39 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:47:39 2015 +0100

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

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