sintonia/airtime_mvc
Albert Santoni 02a96646e1 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	python_apps/pypo/listenerstat.py
2014-02-05 17:35:59 -05:00
..
application Merge branch '2.5.x' into 2.5.x-saas 2014-02-03 12:33:57 -05:00
build CC-5651: Unit Test the Scheduler 2014-01-13 11:43:17 -05:00
library Remove swear words from source code 2013-09-23 16:16:51 +01:00
locale updated translation resources 2014-02-04 18:20:15 +00:00
public Merge branch '2.5.x' into 2.5.x-saas 2013-12-17 17:20:38 -05:00
tests CC-5651: Unit Test the Scheduler 2014-02-05 15:37:47 -05:00