Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()

Conflicts:
	phpBB/includes/auth/auth_ldap.php

...

This commit is contained in:

Andreas Fischer

2014-09-23 22:55:13 +02:00

parent f2a98339e2 2f773fca18

commit 80f15a41c4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available