From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 14 Nov 2014 12:11:40 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=6bcb4dfd35beaabf4c194b32c18f69d6ae98ddde;hp=2ac630bef1ad6e5777cb858d9b81bea01b29f1c9

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
--- 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