Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
	web/conf/apache2.0/irspy.conf

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index ebdd477..3ba0447 100644 (file)
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -19,7 +19,7 @@ MaxClients 32
 
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com
+    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com irspy-dev
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined