Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2011-08-24 10:30:59 -04:00
commit 9eb21cb327
27 changed files with 686 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_full/apache/airtime-vhost
View file

@ -1,9 +1,9 @@
<VirtualHost *:80>
ServerAdmin foo@bar.org
DocumentRoot /var/www/airtime/public
DocumentRoot /usr/share/airtime/public
php_admin_value upload_tmp_dir /tmp
<Directory /var/www/airtime/public>
<Directory /usr/share/airtime/public>
DirectoryIndex index.php
AllowOverride all
Order allow,deny