]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68525ff 15eb669)
Merge branch 'CSPACE-5458-REM' of github.com:collectionspace/services into CSPACE...
authorRichard Millet <richard.millet@berkeley.edu>
Wed, 5 Sep 2012 06:07:22 +0000 (23:07 -0700)
committerRichard Millet <richard.millet@berkeley.edu>
Wed, 5 Sep 2012 06:07:22 +0000 (23:07 -0700)
Conflicts:
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java

1  2 
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java patch | diff1 | diff2 | blob | history