Merge branch 'release/3.1.1' into develop

terramar-labs · Jan 27, 2016 · 696c65a · 696c65a
2 parents b73c5a3 + 31f448a
commit 696c65a
Show file tree

Hide file tree

Showing 3 changed files with 1,066 additions and 343 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "terramar/packages",
-  "description": "Packages extends Composer Satis with a management interface and GitLab integration",
+  "description": "Packages extends Composer Satis with a management interface and integrations for GitLab and GitHub",
   "license": "MIT",
   "type": "application",
   "require": {