]> 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: 88278e0 e0e8be6)
Merge branch 'master' of github.com:collectionspace/services
authorRichard Millet <remillet@berkeley.edu>
Sat, 18 Feb 2012 00:20:15 +0000 (16:20 -0800)
committerRichard Millet <remillet@berkeley.edu>
Sat, 18 Feb 2012 00:20:15 +0000 (16:20 -0800)
1  2 
README.txt patch | diff1 | diff2 | blob | history

diff --cc README.txt
Simple merge