syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [5/6] syncope git commit: Merge branch '1_1_X' into 1_2_X
Date Wed, 12 Nov 2014 13:23:43 GMT
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ò <ilgrosso@apache.org>
Authored: Wed Nov 12 14:09:42 2014 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Wed Nov 12 14:09:42 2014 +0100

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

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



Mime
View raw message