diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-05-04 14:58:36 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-05-04 14:58:36 +0200 |
| commit | c7e602f8d45ad3a06f51c16709b749249bdba3ad (patch) | |
| tree | a5fbe57db7fc5539880c596dee06bb81ee225b34 | |
| parent | 8cb6f3676ccf84c9c12e056cc93caa767cd16ccd (diff) | |
| parent | 52fc5b0da856022261539854311533adb770873f (diff) | |
Merge pull request #3829 from lonnieezell/develop
[ci skip] Updating Project information and ignored files
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | composer.json | 13 |
2 files changed, 23 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 9edcfca6d..5982f9bad 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,15 @@ user_guide_src/cilexer/build/* user_guide_src/cilexer/dist/* user_guide_src/cilexer/pycilexer.egg-info/* /vendor/ -/nbproject/
\ No newline at end of file + +# IDE Files +#------------------------- +/nbproject/ +.idea/* + +## Sublime Text cache files +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache +*.sublime-workspace +*.sublime-project diff --git a/composer.json b/composer.json index 4ff60c57e..4fee20441 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,16 @@ { - "description" : "The CodeIgniter framework", - "name" : "codeigniter/framework", + "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": { + "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" }, |