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 14:23:43 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/e8d8549d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e8d8549d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e8d8549d

Branch: refs/heads/1_2_X
Commit: e8d8549d0adc991c79d3a941c104482ed70e5ff8
Parents: 49ecca4 3fa1fa2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 12 14:09:42 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 12 14:09:42 2014 +0100

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

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