]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
projects / tmp / jakarta-migration.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitab42aef13dc95da512a94cfbd1704eca72637d9f
tree699482718610a3f6d98cc285eca4176c483d61a1tree | snapshot
parent68525ff735d108454ea7d7111becea910240105dcommit | diff
parent15eb66910000eb165f63002c77c275e44fd0d1a1commit | diff
Merge branch 'CSPACE-5458-REM' of github.com:collectionspace/services into CSPACE-5458-REM

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
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java diff1 | diff2 | blob | history