aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-18 09:46:32 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-18 09:46:32 +0200
commitb176b86f111a05338ed3c74026bcf19d42ec0ee3 (patch)
tree84688d2ce5bee1ff77e87565d3d45f27136312ad /phpBB/includes/mcp/mcp_notes.php
parentMerge branch 'develop-olympus' into develop (diff)
parentMerge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus (diff)
downloadphpbb-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar.gz
phpbb-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar.bz2
phpbb-b176b86f111a05338ed3c74026bcf19d42ec0ee3.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
Diffstat (limited to 'phpBB/includes/mcp/mcp_notes.php')
0 files changed, 0 insertions, 0 deletions