Merge branch 'dev' into perms
This commit is contained in:
commit
6a4573b935
@ -231,7 +231,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Sets the timezone from the channel in RedBasicAuth.
|
||||
* @brief Sets the timezone from the channel in BasicAuth.
|
||||
*
|
||||
* Set in mod/cloud.php if the channel has a timezone set.
|
||||
*
|
||||
|
@ -626,6 +626,7 @@ function head_get_js() {
|
||||
|
||||
$str = '';
|
||||
if(App::$js_sources) {
|
||||
ksort(App::$js_sources,SORT_NUMERIC);
|
||||
foreach(App::$js_sources as $sources) {
|
||||
if(count($sources)) {
|
||||
foreach($sources as $source) {
|
||||
|
Reference in New Issue
Block a user