]> git.mxchange.org Git - jbonuscard-lib.git/commit
projects / jbonuscard-lib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e0313e7 5cc566a)
Merge branch 'master' of file:///E:/Java%20Project/addressbook-lib
authorRoland Haeder <roland@mxchange.org>
Tue, 13 Oct 2015 13:33:47 +0000 (15:33 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 13 Oct 2015 13:33:47 +0000 (15:33 +0200)
commit85dfaa739579a63b610c48467352af43e12e6e76
treea40c477886df8982fc87da55feafab2829ea5120tree | snapshot
parente0313e717508afb54bfceb807611864489344b70commit | diff
parent5cc566a80999b4fa40773729dc3c9c74f8137268commit | diff
Merge branch 'master' of file:///E:/Java%20Project/addressbook-lib

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
Unnamed repository; edit this file 'description' to name the repository.