diff options
author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
---|---|---|
committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /.gitignore | |
parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 11fb6d67c..a035c2b27 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ application/logs/* user_guide_src/build/* user_guide_src/cilexer/build/* user_guide_src/cilexer/dist/* -user_guide_src/cilexer/pycilexer.egg-info/*
\ No newline at end of file +user_guide_src/cilexer/pycilexer.egg-info/* +/vendor/
\ No newline at end of file |