summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLonnie Ezell <lonnieje@gmail.com>2015-05-04 15:01:30 +0200
committerLonnie Ezell <lonnieje@gmail.com>2015-05-04 15:01:30 +0200
commita58ce55469efc86c87579b971350fdd2c4ea6efd (patch)
treec8de9cde442a7ba5283b9c651ac6302d6fe5689c
parent8e9b93d83a95141bfca2268113a0465a66a32d1f (diff)
parentc7e602f8d45ad3a06f51c16709b749249bdba3ad (diff)
Merge branch 'develop' into attributes
-rw-r--r--composer.json23
1 files changed, 11 insertions, 12 deletions
diff --git a/composer.json b/composer.json
index c5f2f5aca..4fee20441 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,16 @@
{
- "description" : "The CodeIgniter framework",
- "name" : "codeigniter/framework",
- "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.",
- "type": "project",
- "homepage": "http://codeigniter.com",
+ "description": "The CodeIgniter framework",
+ "name": "codeigniter/framework",
+ "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.",
+ "type": "project",
+ "homepage": "http://codeigniter.com",
"license": "MIT",
- "support": {
- "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
- "forum": "http://forum.codeigniter.com/",
- "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki",
- "irc": "http://www.codeigniter.com/irc",
- "source": "https://github.com/bcit-ci/CodeIgniter"
- },
+ "support": {
+ "forum": "http://forum.codeigniter.com/",
+ "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki",
+ "irc": "http://www.codeigniter.com/irc",
+ "source": "https://github.com/bcit-ci/CodeIgniter"
+ },
"require": {
"php": ">=5.2.4"
},