SITKA Public Git / sitka / doc / acquisitions.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 324344b 42c8f4c)
Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 7 Jul 2015 17:58:22 +0000 (10:58 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 7 Jul 2015 17:58:22 +0000 (10:58 -0700)
Conflicts:
acq/media/Thumbs.db
admin/media/Thumbs.db

1  2 
acq/media/Thumbs.db patch | diff1 | diff2 | blob | history

diff --cc acq/media/Thumbs.db
index e54d1c1,c309dd6..e4031d0
Binary files differ
Acquisitions User Manual