Merge branch 'sitka_2_4' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual...
-rw-r--r-- 11 .gitignore
drwxr-xr-x - admin
drwxr-xr-x - booking
drwxr-xr-x - cat
drwxr-xr-x - circ
drwxr-xr-x - intro
drwxr-xr-x - inventory
drwxr-xr-x - jspac
drwxr-xr-x - media
drwxr-xr-x - opac
-rw-r--r-- 3072 photothumb.db
drwxr-xr-x - report
-rw-r--r-- 6807 root.xml
-rw-r--r-- 767 search-box.html
drwxr-xr-x - serials
-rw-r--r-- 2642 sitka.css
-rw-r--r-- 4832 sitka.png
-rw-r--r-- 5764 template.xml