diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-20 17:55:56 +0100 | 
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-20 17:55:56 +0100 | 
| commit | d2778e67eaff5453042e6fd851b7d678141be58d (patch) | |
| tree | fd2b892f29eaa61038ab418b0abb3d473cbeb5a6 /phpBB/includes/acm/acm_memory.php | |
| parent | fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483 (diff) | |
| parent | af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f (diff) | |
| download | forums-d2778e67eaff5453042e6fd851b7d678141be58d.tar forums-d2778e67eaff5453042e6fd851b7d678141be58d.tar.gz forums-d2778e67eaff5453042e6fd851b7d678141be58d.tar.bz2 forums-d2778e67eaff5453042e6fd851b7d678141be58d.tar.xz forums-d2778e67eaff5453042e6fd851b7d678141be58d.zip  | |
Merge branch 'prep-release-3.0.8' into develop-olympus
* prep-release-3.0.8:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/includes/acm/acm_memory.php')
0 files changed, 0 insertions, 0 deletions
