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

Merge branch '2.5.x' into saas

Browse source 
Conflicts:
	airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
This commit is contained in:
drigato 2015-01-23 16:24:09 -05:00
commit ef6572aea9
22 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
View file

@ -106,4 +106,4 @@
<table name="cc_show_hosts">
</table>
</dataset>
</dataset>