aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMáté Bartus <mate.bartus@gmail.com>2016-02-25 12:30:04 +0100
committerMáté Bartus <mate.bartus@gmail.com>2016-02-25 12:30:04 +0100
commitf249c52af69051ce6274659a6f924510137fff2d (patch)
treef6157172deda697a790da27143ddb424e94cc99f /phpBB/phpbb
parent68996e527eddba545a045b4d1142f73942862b45 (diff)
parent294f926bfccc6be8a7098923b4c55ebab66e83e3 (diff)
downloadforums-f249c52af69051ce6274659a6f924510137fff2d.tar
forums-f249c52af69051ce6274659a6f924510137fff2d.tar.gz
forums-f249c52af69051ce6274659a6f924510137fff2d.tar.bz2
forums-f249c52af69051ce6274659a6f924510137fff2d.tar.xz
forums-f249c52af69051ce6274659a6f924510137fff2d.zip
Merge pull request #4191 from Nicofuma/ticket/14495
[ticket/14495] Updates the version to 3.3.0-a1-dev
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json
index 758125234f..0b6299d6bc 100644
--- a/phpBB/phpbb/composer.json
+++ b/phpBB/phpbb/composer.json
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "3.2.x-dev"
+ "dev-master": "3.3.x-dev"
}
}
}