diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
| commit | db9ea66069f2a2df6044e8267a68eae377c45911 (patch) | |
| tree | aa93597df2ee43ceeaa980db864b58143f2e06df /vendor/sabre/vobject/lib/TimeZoneUtil.php | |
| parent | ef02464e3c3188563349bfda42585ce40cdb45ad (diff) | |
| parent | c2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff) | |
| download | volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2 volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'vendor/sabre/vobject/lib/TimeZoneUtil.php')
| -rw-r--r-- | vendor/sabre/vobject/lib/TimeZoneUtil.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/sabre/vobject/lib/TimeZoneUtil.php b/vendor/sabre/vobject/lib/TimeZoneUtil.php index 4873daf92..2a95ae898 100644 --- a/vendor/sabre/vobject/lib/TimeZoneUtil.php +++ b/vendor/sabre/vobject/lib/TimeZoneUtil.php @@ -240,10 +240,10 @@ class TimeZoneUtil { if (!is_null(self::$map)) return; self::$map = array_merge( - include __DIR__ . '/timezonedata/windowszones.php', - include __DIR__ . '/timezonedata/lotuszones.php', - include __DIR__ . '/timezonedata/exchangezones.php', - include __DIR__ . '/timezonedata/php-workaround.php' + include __DIR__ . '/timezonedata/windowszones.php', + include __DIR__ . '/timezonedata/lotuszones.php', + include __DIR__ . '/timezonedata/exchangezones.php', + include __DIR__ . '/timezonedata/php-workaround.php' ); } @@ -260,7 +260,7 @@ class TimeZoneUtil { * @return array */ static function getIdentifiersBC() { - return include __DIR__ . '/timezonedata/php-bc.php'; + return include __DIR__ . '/timezonedata/php-bc.php'; } } |