Merge branch '2.1' into 2.2

This commit is contained in:
Damian Mooyman 2016-05-19 13:55:29 +12:00
commit 9b2183167f

View File

@ -16,26 +16,32 @@ Page:
parent: parent:
Title: Parent Title: Parent
URLSegment: parent URLSegment: parent
Locale: en_US
child1: child1:
Title: Child 1 Title: Child 1
URLSegment: child1 URLSegment: child1
Parent: =>Page.parent Parent: =>Page.parent
Locale: en_US
child2: child2:
Title: Child 2 Title: Child 2
URLSegment: child2 URLSegment: child2
Parent: =>Page.parent Parent: =>Page.parent
Locale: en_US
child3: child3:
Title: Child 3 Title: Child 3
URLSegment: child3 URLSegment: child3
Parent: =>Page.parent Parent: =>Page.parent
Locale: en_US
grandchild1: grandchild1:
Title: Grandchild Title: Grandchild
URLSegment: grandchild1 URLSegment: grandchild1
Parent: =>Page.child1 Parent: =>Page.child1
Locale: en_US
grandchild2: grandchild2:
Title: Grandchild Title: Grandchild
URLSegment: grandchild2 URLSegment: grandchild2
Parent: =>Page.child1 Parent: =>Page.child1
Locale: en_US
TranslatableTest_DataObject: TranslatableTest_DataObject:
testobject_en: testobject_en:
TranslatableProperty: en_US TranslatableProperty: en_US