Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server ... Conflicts: docs/installationguide/ubuntu.rst misc/apache.conf.in src/zm_monitor.cpp		2015-08-27 10:34:47 -04:00
..
debian	php-gd should isntead be php5-gd	2015-07-16 13:59:06 -04:00
debian8	db_get fails if there is no debconf entry (for example if the	2015-07-23 15:07:32 -04:00
debian_cmake	typos and whitespace fixes	2015-08-16 12:45:45 -04:00
fedora	configure apache to follow symlinks so it find nph-zms	2015-08-13 20:23:52 -05:00
opensuse	Fix redalert.wav symlinks	2015-08-10 08:13:37 -05:00
redhat	configure apache to follow symlinks so it find nph-zms	2015-08-13 20:23:52 -05:00
ubuntu1204	php-gd should isntead be php5-gd	2015-07-16 13:59:06 -04:00
ubuntu1204_cmake	remove systemd overrides	2015-08-20 13:49:04 -04:00
ubuntu1504	Merge branch 'master' into multi-server	2015-07-16 16:37:44 -04:00
ubuntu1504_cmake	set AllowOverride All for api dir	2015-08-19 16:08:48 -04:00
ubuntu1504_cmake_split_packages	add the api tmp link	2015-08-20 20:36:09 -04:00