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 2014/11/12 10:08:38 UTC

[5/8] 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/b3fe89a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b3fe89a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b3fe89a3

Branch: refs/heads/master
Commit: b3fe89a30bc33dcd7aa393252861774c4132720c
Parents: b836d8c 0ebf6ca
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 09:55:02 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 09:55:02 2014 +0100

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

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