Isaac Connor e840eec2a4 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas ... Conflicts: docs/installationguide/index.rst		2016-01-02 14:43:04 -05:00
..
images	Merge branch 'multi-server' into storageareas	2016-01-02 14:42:47 -05:00
centos.rst	restore missing docs	2015-12-31 15:35:50 +11:00
debian.rst	restore missing docs	2015-12-31 15:35:50 +11:00
fedora.rst	restore missing docs	2015-12-31 15:35:50 +11:00
index.rst	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-01-02 14:43:04 -05:00
multiserver.rst	Move design notes out of the image. Assign Red and Green colors to Storage & dB Servers in the diagram.	2016-01-01 09:20:11 -06:00
ubuntu.rst	removed -master from ppa - when 1.29 releases it will be stable	2015-12-18 15:11:05 -05:00