diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-04-29 17:08:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-04-29 17:08:49 +0200 |
| commit | 40351fae96de34312ca960abc5048c835f50e3ef (patch) | |
| tree | 83adee6a90e348142a19b20a645880f76f162f54 /phpBB/language/en/common.php | |
| parent | 0b6accf1acd32b08c84906276717b3bdd43335a4 (diff) | |
| parent | 23b3667978bb9177c8ffb6877904e117a18693fa (diff) | |
| download | forums-40351fae96de34312ca960abc5048c835f50e3ef.tar forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.gz forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.bz2 forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.xz forums-40351fae96de34312ca960abc5048c835f50e3ef.zip | |
Merge pull request #2364 from nickvergessen/ticket/12456
[ticket/12456] Missing new lines at the end of file in language files
* nickvergessen/ticket/12456:
[ticket/12456] Add , after the last array element
[ticket/12456] Fix duplicated empty lines in language files
[ticket/12456] Fix missing new lines at the end of email templates
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 677b228cc6..f78ce76050 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -1370,7 +1370,7 @@ $lang = array_merge($lang, array( 'D M d, Y g:i a' => 'Mon Jan 01, 2007 1:37 pm', 'F jS, Y, g:i a' => 'January 1st, 2007, 1:37 pm', '|d M Y|, H:i' => 'Today, 13:37 / 01 Jan 2007, 13:37', - '|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm' + '|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm', ), // The default dateformat which will be used on new installs in this language |