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

Merge branch '2.2.x' into 2.2.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
This commit is contained in:
Martin Konecny 2012-11-28 16:10:33 -05:00
commit 4983721565
27 changed files with 385 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.py
View file

@ -18,7 +18,7 @@ from configobj import ConfigObj
import string
import traceback
AIRTIME_VERSION = "2.2.0"
AIRTIME_VERSION = "2.2.1"
# TODO : Place these functions in some common module. Right now, media