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

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
commit 609f073a25
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/css/styles.css
View file

@ -2262,7 +2262,7 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
}
.preferences.simple-formblock dd.block-display,
.preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select,
.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
width: 100%;
}
.preferences dd.block-display .input_text_area, .preferences dd.block-display .input_text

2
airtime_mvc/public/index.php
View file

@ -54,7 +54,7 @@ if (array_key_exists('config', $_GET)) {
showConfigCheckPage();
}
$filename = isset($_SERVER['AIRTIME_CONF']) ?
$filename = isset($_SERVER['AIRTIME_CONF']) ?
$_SERVER['AIRTIME_CONF'] : AIRTIME_CONFIG_STOR . AIRTIME_CONFIG;
// If a configuration file exists, forward to our boot script