SITKA Public Git / sitka / doc / acquisitions.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 81afcd9)
Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 17:47:23 +0000 (10:47 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 17:47:23 +0000 (10:47 -0700)
Conflicts:
admin/media/Thumbs.db

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
admin/media/Thumbs.db patch | blob | blame | history

diff --git a/admin/media/Thumbs.db b/admin/media/Thumbs.db
index 2e4fd6e..0e69383 100644 (file)
Binary files a/admin/media/Thumbs.db and b/admin/media/Thumbs.db differ
Acquisitions User Manual