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

Merge branch 'ryerson-history' into 2.5.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
This commit is contained in:
Naomi Aro 2013-09-02 15:52:43 -04:00
commit 682a37894b
156 changed files with 38382 additions and 4637 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.py
View file

@ -16,7 +16,7 @@ import base64
import traceback
from configobj import ConfigObj
AIRTIME_VERSION = "2.4.1"
AIRTIME_VERSION = "2.5.0"
# TODO : Place these functions in some common module. Right now, media