Commit graph

4 commits

Author SHA1 Message Date
drigato
ef6572aea9 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
2015-01-23 16:24:09 -05:00
Albert Santoni
239aae029e Added image_path to unit tests. 2015-01-22 17:30:29 -05:00
Duncan Sommerville
0196aa21f5 Fixed testcases to account for show image path in and show instance description 2014-10-09 09:39:50 -04:00
drigato
f7602cadd8 Fixed broken test 2014-03-12 17:32:22 -04:00