Update master to 2.0 for 4.0 compatibility

This commit is contained in:
Damian Mooyman 2015-10-16 11:30:00 +13:00
parent 750f4a9d9f
commit f932aa4b04
2 changed files with 3 additions and 5 deletions

View File

@ -295,7 +295,6 @@ class PostgreSQLDatabase extends SS_Database {
'"Content"',
'"LastEdited"',
'"Created"',
'NULL AS "Filename"',
'NULL AS "Name"',
'"CanViewType"'
),
@ -305,10 +304,9 @@ class PostgreSQLDatabase extends SS_Database {
'0 AS "ParentID"',
'"Title"',
'NULL AS "URLSegment"',
'"Content"',
'NULL "Content"',
'"LastEdited"',
'"Created"',
'"Filename"',
'"Name"',
'NULL AS "CanViewType"'
)

View File

@ -10,11 +10,11 @@
}
],
"require": {
"silverstripe/framework": ">=3.2"
"silverstripe/framework": "~4.0"
},
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "2.0.x-dev"
}
}
}