Merge branch '2.5.x-installer' into saas-dev-plus

Browse source

Conflicts:
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/index.php

...

This commit is contained in:

Albert Santoni 2015-06-16 11:20:43 -04:00

parent aa286efee4 57d63ebb19

commit 609f073a25

2 changed files with 2 additions and 2 deletions

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

Download patch file Download diff file Expand all files Collapse all files