Merge branch 'sitka_2_12' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual...
authortji <tina.ji@bc.libraries.coop>
Mon, 15 May 2017 20:17:35 +0000 (13:17 -0700)
committertji <tina.ji@bc.libraries.coop>
Mon, 15 May 2017 20:17:35 +0000 (13:17 -0700)
commita43943343c58c36a9508496e63c0c91425047374
tree2a0e312327e5835c3cff46303db86da1a9f48d49
parentce51c2d7a5179ad568de1533868fee28bc17f24e
parent70c955834b2a11958eecda19f29c532a11a7e77e
Merge branch 'sitka_2_12' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual.git into sitka_2_12