aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff/diff.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-07-05 01:07:22 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-07-05 01:07:22 +0200
commit5f73cdcdc295aeded117377496e9917c712f353f (patch)
tree2ad2e330347030b4f0a81831aeab6fafad8db06b /phpBB/includes/diff/diff.php
parent1570a1e3b90b3f2d0402cd2530d0d030e27ab13e (diff)
parentfa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (diff)
downloadforums-5f73cdcdc295aeded117377496e9917c712f353f.tar
forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.gz
forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.bz2
forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.xz
forums-5f73cdcdc295aeded117377496e9917c712f353f.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9 release. [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions