diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-06-20 22:50:10 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-06-20 22:50:10 +0200 |
| commit | 7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3 (patch) | |
| tree | e6d1313af5e8fdd48e6fcefb30d86158d0d0ac53 /phpBB/includes/acm/acm_memory.php | |
| parent | 389c24044a189aea5ae936c21b8df39cbb1b77f6 (diff) | |
| parent | b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (diff) | |
| download | forums-7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3.tar forums-7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3.tar.gz forums-7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3.tar.bz2 forums-7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3.tar.xz forums-7d6545bd096f030af6a2e1cf8b4d865e1f9a4da3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
[ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
[ticket/9665] Allow preview of signature when it is the string "0".
[ticket/9112] Make sure current user can see most active forum/topic.
[ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
[ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
Conflicts:
phpBB/styles/subsilver2/template/ucp_profile_signature.html
phpBB/styles/subsilver2/template/viewtopic_body.html
Diffstat (limited to 'phpBB/includes/acm/acm_memory.php')
0 files changed, 0 insertions, 0 deletions