projects / jaddressbook-lib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.