diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 22:58:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 22:58:52 +0200 |
| commit | e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51 (patch) | |
| tree | f8d4d2b62b2bcd2f5b37ce7cbf6fa873cff185b0 /intl/tzdata/source/ee | |
| parent | bfb36627c66ff8a27da7c1bace60496352fd096b (diff) | |
| parent | e4b2fa17baea1d35d80de19ffb90d9ba2a1033f8 (diff) | |
| download | UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.gz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.lz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.xz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# security/manager/ssl/nsSTSPreloadList.errors
# security/manager/ssl/nsSTSPreloadList.inc
Diffstat (limited to 'intl/tzdata/source/ee')
| -rw-r--r-- | intl/tzdata/source/ee/metaZones.res | bin | 41232 -> 41488 bytes |
| -rw-r--r-- | intl/tzdata/source/ee/timezoneTypes.res | bin | 20032 -> 20064 bytes |
| -rw-r--r-- | intl/tzdata/source/ee/windowsZones.res | bin | 22400 -> 22496 bytes |
| -rw-r--r-- | intl/tzdata/source/ee/zoneinfo64.res | bin | 152432 -> 154224 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/intl/tzdata/source/ee/metaZones.res b/intl/tzdata/source/ee/metaZones.res Binary files differindex b5d94a8bc..e495c2aa9 100644 --- a/intl/tzdata/source/ee/metaZones.res +++ b/intl/tzdata/source/ee/metaZones.res diff --git a/intl/tzdata/source/ee/timezoneTypes.res b/intl/tzdata/source/ee/timezoneTypes.res Binary files differindex 9001738e6..046835436 100644 --- a/intl/tzdata/source/ee/timezoneTypes.res +++ b/intl/tzdata/source/ee/timezoneTypes.res diff --git a/intl/tzdata/source/ee/windowsZones.res b/intl/tzdata/source/ee/windowsZones.res Binary files differindex 56f1b19ec..2a6500de3 100644 --- a/intl/tzdata/source/ee/windowsZones.res +++ b/intl/tzdata/source/ee/windowsZones.res diff --git a/intl/tzdata/source/ee/zoneinfo64.res b/intl/tzdata/source/ee/zoneinfo64.res Binary files differindex 425d7f838..faef29683 100644 --- a/intl/tzdata/source/ee/zoneinfo64.res +++ b/intl/tzdata/source/ee/zoneinfo64.res |