Nathan Guse 052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop ... * remotes/upstream/develop-olympus: [ticket/12106] Combined first and second sentence [ticket/12106] Adds a explaination that admin/mods still able to use the board Conflicts: phpBB/language/en/acp/board.php		2014-03-10 21:51:07 -05:00
..
attachments.php	Merge branch 'develop-olympus' into develop	2012-05-31 11:55:12 +02:00
ban.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
board.php	Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop	2014-03-10 21:51:07 -05:00
bots.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
common.php	[ticket/11645] Rename .MODs tab in ACP to Extensions	2014-03-02 11:58:26 -08:00
database.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
email.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
extensions.php	[ticket/11996] Remove note until we really do disable the board	2014-02-03 20:48:01 +01:00
forums.php	[ticket/10650] Changed acp option from per forum to global	2012-04-08 10:34:44 +05:30
groups.php	[ticket/10411] Use template loops instead of defining the html in php files	2013-02-25 20:24:11 +01:00
index.htm	some bugfixes	2006-10-26 10:58:58 +00:00
language.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
modules.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
permissions.php	Merge branch 'develop-olympus' into develop	2013-07-13 13:16:58 -04:00
permissions_phpbb.php	[ticket/11734] Readd accidently removed language strings of forum permissions	2013-07-23 16:26:01 +02:00
posting.php	Merge branch 'ticket/8319' into ticket/8319-develop2	2013-07-10 17:24:49 +02:00
profile.php	[ticket/12251] Add string validation for a-zA-Z0-9 and underscore	2014-03-06 12:28:36 +01:00
prune.php	[ticket/12045] Only display group selection if there are groups	2013-11-28 13:22:25 +01:00
search.php	Merge branch 'develop-olympus' into develop	2013-06-05 01:55:49 +05:30
styles.php	[ticket/12236] Move AOL Instant Messanger field to custom profile field	2014-03-05 22:13:22 +01:00
users.php	Merge branch 'develop-olympus' into develop	2012-07-21 16:15:42 +02:00