Merge branch '1.3' into 1.4

dhensby · dhensby · commit ee5a720c91a1 · 2017-11-28T16:11:35.000Z
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ following is a minimal setup to have the map show in the CMS:
 ```php
 class Store extends DataObject
 {
-    public static $db = array(
+    private static $db = array(
         'Title' => 'Varchar(255)',
         'Latitude' => 'Varchar',
         'Longitude' => 'Varchar',

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ following is a minimal setup to have the map show in the CMS:`
`21`	`21`	```php
`22`	`22`	`class Store extends DataObject`
`23`	`23`	`{`
`24`		`- public static $db = array(`
	`24`	`+ private static $db = array(`
`25`	`25`	`'Title' => 'Varchar(255)',`
`26`	`26`	`'Latitude' => 'Varchar',`
`27`	`27`	`'Longitude' => 'Varchar',`