diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
| commit | c79c1b391331ab7c8c0f01265a627ffae23d54e2 (patch) | |
| tree | 66d988e77e1af2b8695a9726a76fc7d5743a69a6 /vendor/sabre/vobject/lib/TimeZoneUtil.php | |
| parent | 716a83d1f77e2d6f26b25ab03ffe130c11ef7feb (diff) | |
| parent | b926a4c67e4d7dcba01df91dddcc047abde246bb (diff) | |
| download | volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.gz volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.bz2 volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.zip | |
Merge branch 'dev' into pdo
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'; } } |