Merging master after 3.0.7 release into develop-olympus to make sure there are no inconsistencies.

2 files changed, 4 insertions, 4 deletions

diff --git a/build/build_diff.php b/build/build_diff.php
index ab3bb774b7..c8a40f4f5e 100755
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -11,9 +11,9 @@
 
 // CONFIG - Begin
 $substitute_old = '3.0.6';
-$substitute_new = '3.0.7-RC1';
+$substitute_new = '3.0.7';
 $simple_name_old = 'phpbb306';
-$simple_name_new = 'phpbb307-RC1';
+$simple_name_new = 'phpbb307';
 $echo_changes = false;
 // Set this to true to just compress the changes and do not build them again
 // This should be used for building custom modified txt file. ;)
@@ -405,4 +405,4 @@ function run_command($command)
 	echo "\n- Command Run: " . $command . "\n";
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/build/package.php b/build/package.php
index 0620d4c6c2..e04750d4be 100755
--- a/build/package.php
+++ b/build/package.php
@@ -15,7 +15,7 @@
 // If RC8 drops remove the install/data directory
 //$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3');
 //$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7');
-$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3', '3.0.6-RC4', '3.0.6', '3.0.7-RC1');
+$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7-RC2', '3.0.7');
 $verbose = false;
 
 require('build_helper.php');