Merge branch 'dev'

ntd · Aug 2, 2016 · 464c2ea · 464c2ea
2 parents 4a92aeb + 4a73f2a
commit 464c2ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,3 +9,8 @@ of this ChangeLog is autogenerated by the following command:
         --date=format:'%Y-%m-%d' \
         --pretty=format:'* %cd %H %s' \
         $(git ls-remote -t .|tail -1|cut -f1)..
+
+### 1.0.0 (2016-08-02)
+
+* 2016-08-02 472b541f2d323ae8b228d789a91d3f67a569af67 Install silverstrap-module to silverstrap/ by default
+* 2016-08-02 4a92aeb3ab2d50e624d892d23f8ee7ae412d1bee Initial public release
diff --git a/composer.json b/composer.json
@@ -19,5 +19,10 @@
     },
     "require": {
         "silverstripe/framework": "~3.1"
+    },
+    "extra": {
+        "installer-paths": {
+            "silverstrap/": ["entidi/silverstrap-module"]
+        }
     }
 }