Skip to content

Commit 25749a8

Browse files
committed
Merge branch 'phpbb/3.2.x' into phpbb/3.3.x
# Conflicts: # composer.lock
2 parents ea33dbd + f13f575 commit 25749a8

File tree

4 files changed

+631
-207
lines changed

4 files changed

+631
-207
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"extra": {
7272
"display-name": "phpBB Customisation Database (Titania)",
7373
"soft-require": {
74-
"phpbb/phpbb": "3.1.*@dev"
74+
"phpbb/phpbb": "3.2.*@dev"
7575
}
7676
}
7777
}

0 commit comments

Comments
 (0)