phpbb/phpBB/language/en
Andreas Fischer 1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
2014-09-24 21:24:29 +02:00
..
acp Merge branch 'develop-olympus' into develop-ascraeus 2014-09-24 21:24:29 +02:00
email [ticket/10073] Add Admin contact email template 2014-05-29 02:14:29 +02:00
app.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
captcha_qa.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
captcha_recaptcha.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
cli.php [ticket/13003] Add missing language keys 2014-08-21 19:37:03 +02:00
common.php [ticket/12858] Remove hardcoded language entries from timezone selects 2014-09-17 17:56:04 +02:00
groups.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
help_bbcode.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
help_faq.php [ticket/12197] Fix several misleading FAQ entries 2014-06-25 22:26:15 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/12768] More fixes in language files 2014-07-08 02:09:10 +03:00
iso.txt [ticket/12594] Replace phpBB Group with phpBB Limited 2014-05-28 01:07:56 +02:00
mcp.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
memberlist.php [ticket/12768] More fixes in language files 2014-07-08 02:09:10 +03:00
migrator.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
plupload.php [ticket/12723] Add Sniff ensuring PHP files use the correct file header 2014-06-22 00:45:34 +02:00
posting.php [ticket/13019] Rename deletion reason label. 2014-09-14 10:39:25 -07:00
search.php [ticket/13022] Language adjustments 2014-09-08 23:14:33 +02:00
search_ignore_words.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
search_synonyms.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
ucp.php [ticket/13055] Add string profile fields validation options to support unicode 2014-09-18 08:19:08 +08:00
viewforum.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewtopic.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00