Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
jo 2023-07-01 16:56:49 +02:00
parent d3296ac624 3fe1df1c6d
commit c911dbded6
No known key found for this signature in database
GPG Key ID: B2FEC9B22722B984
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/application/common/DateHelper.php
View File

@ -46,7 +46,7 @@ class Application_Common_DateHelper
} }
/** Get the abbreviated timezone for the currently logged in user. /** Get the abbreviated timezone for the currently logged in user.
* @return A string containing the short form of the timezone set in the preferences for the current user (eg. EST, CEST, etc.) * @return string A string containing the short form of the timezone set in the preferences for the current user (eg. EST, CEST, etc.)
*/ */
public static function getUserTimezoneAbbreviation() public static function getUserTimezoneAbbreviation()
{ {
@ -54,7 +54,7 @@ class Application_Common_DateHelper
} }
/** Get the abbreviated timezone string of the timezone the station is set to. /** Get the abbreviated timezone string of the timezone the station is set to.
* @return A string containing the short form of the station's timezone (eg. EST, CEST, etc.) * @return string A string containing the short form of the station's timezone (eg. EST, CEST, etc.)
*/ */
public static function getStationTimezoneAbbreviation() public static function getStationTimezoneAbbreviation()
{ {

2
legacy/tools/composer.json
View File

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