Albert Santoni 864352c6a7 Merge branch 'cc-5709-airtime-analyzer' into saas ... Conflicts: python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py		2014-11-12 17:04:00 -05:00
..
application	Merge branch 'cc-5709-airtime-analyzer' into saas	2014-11-12 17:04:00 -05:00
build	Added description field to cc_show_instances table	2014-09-19 12:56:47 -04:00
library	Remove swear words from source code	2013-09-23 16:16:51 +01:00
locale	Translation update, and fixed bad merge in fr_FR	2014-11-11 18:19:49 -05:00
public	Merged 2.5.x into saas	2014-11-10 09:08:03 -05:00
tests	Fixed testcases to account for show image path in and show instance description	2014-10-09 09:39:50 -04:00