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

parent fd42c67b0b 239aae029e

commit ef6572aea9

22 changed files with 22 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files