phpbb/phpBB/adm
Andreas Fischer 7d5438eb03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.

Conflicts:
	phpBB/adm/index.php
2011-06-09 13:00:39 +02:00
..
images removed executable props [Bug #6464] 2008-06-04 15:37:06 +00:00
style Merge branch 'develop-olympus' into develop 2011-06-09 13:00:39 +02:00
index.php Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympus 2011-06-09 12:55:04 +02:00
swatch.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00