Joseph Warner 3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth ... Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673		2013-09-06 20:35:54 -04:00
..
acp	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	2013-09-06 20:35:54 -04:00
email	Merge branch 'develop-olympus' into develop	2013-09-02 12:31:27 +02:00
mods	[feature/sphinx-fulltext-search] integrate sphinx language keys with core	2012-07-12 17:31:49 +05:30
app.php	[feature/controller] Remove unused language strings	2012-11-18 15:51:32 -05:00
captcha_qa.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
captcha_recaptcha.php	[ticket/9975] Moved a few E_USER_ERROR errors to /language	2013-04-23 09:55:36 -07:00
common.php	[feature/oauth] Changes due to code review	2013-08-24 22:04:04 -04:00
groups.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
help_bbcode.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
help_faq.php	Merge branch 'develop-olympus' into develop	2013-07-25 14:08:06 +02:00
index.htm	ISO	2002-10-04 12:40:07 +00:00
install.php	[ticket/11574] Remove install/udpate/new/ fallback from database_update.php	2013-07-30 01:38:06 +02:00
iso.txt	#10549	2007-05-13 22:20:30 +00:00
mcp.php	[ticket/9657] Fix english language :(	2013-07-11 22:46:34 -04:00
memberlist.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
migrator.php	[ticket/11662] Typos: occured -> occurred	2013-07-12 17:51:29 +02:00
posting.php	[ticket/9657] Fix english language :(	2013-07-11 22:46:34 -04:00
search.php	[ticket/11032] fix language of error displayed	2012-08-15 22:57:02 +05:30
search_ignore_words.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
search_synonyms.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp.php	[feature/oauth] Changes due to code review	2013-08-24 22:04:04 -04:00
viewforum.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
viewtopic.php	[feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)	2012-11-03 23:37:35 +01:00