diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-02-04 18:20:01 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-02-04 18:20:01 +0100 |
| commit | e5454f9b28f123a5549971f580255a065b2f8cc2 (patch) | |
| tree | c4927e7b7afb0bf242976034630cc60f2f1db00f /system/language/english/date_lang.php | |
| parent | 6db62ab0ad0e223806a1367e12b1884b48dc65d7 (diff) | |
| parent | eccac6e6a73a4d1a5b40f383ce64359c2c94ae12 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/language/english/date_lang.php')
| -rw-r--r-- | system/language/english/date_lang.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php index 0edbe28f3..c61c9c2ad 100644 --- a/system/language/english/date_lang.php +++ b/system/language/english/date_lang.php @@ -92,6 +92,3 @@ $lang['UP12'] = '(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand $lang['UP1275'] = '(UTC +12:45) Chatham Islands Standard Time'; $lang['UP13'] = '(UTC +13:00) Samoa Time Zone, Phoenix Islands Time, Tonga'; $lang['UP14'] = '(UTC +14:00) Line Islands'; - -/* End of file date_lang.php */ -/* Location: ./system/language/english/date_lang.php */
\ No newline at end of file |