Merge branch 'stable'

This commit is contained in:
jo 2023-10-03 22:24:35 +02:00
commit 363f499882
No known key found for this signature in database
GPG key ID: B2FEC9B22722B984
4 changed files with 4 additions and 4 deletions

View file

@ -10,7 +10,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
['ViewScript', ['viewScript' => 'form/preferences_livestream.phtml']],
]);
// automatic trasition on source disconnection
// automatic transition on source disconnection
$auto_transition = new Zend_Form_Element_Checkbox('auto_transition');
$auto_transition->setLabel(_('Auto Switch Off:'))
->setValue(Application_Model_Preference::GetAutoTransition());

View file

@ -1,6 +1,6 @@
{
"require": {
"php": "^7.4",
"friendsofphp/php-cs-fixer": "<3.27.1"
"friendsofphp/php-cs-fixer": "<3.34.1"
}
}