diff options
| author | Evan Winslow <evan@elgg.org> | 2012-05-16 23:52:54 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2012-05-16 23:52:54 -0700 |
| commit | dfc5cf46a841a144f868ebdd99262c0479a4b59d (patch) | |
| tree | 483ad4cedf5031a765be06da148550ba1141e2b1 | |
| parent | 1b039f3ac1e3b975413968f21bd5bbf45b055a0d (diff) | |
| parent | f9bc1a99e603435d140e606cbfef94baa712593e (diff) | |
| download | elgg-dfc5cf46a841a144f868ebdd99262c0479a4b59d.tar.gz elgg-dfc5cf46a841a144f868ebdd99262c0479a4b59d.tar.bz2 | |
Merge remote-tracking branch 'mrclay/patch-3' into 1.8
| -rw-r--r-- | .gitignore | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index edfede73b..c0bba2c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ +# ignore Elgg configuration /engine/settings.php /.htaccess -/.buildpath -/.settings -/.project /mod/* + +# don't ignore bundled plugins !/mod/blog/ !/mod/bookmarks/ !/mod/categories/ @@ -38,3 +38,17 @@ !/mod/uservalidationbyemail/ !/mod/zaudio/ +# ignore IDE/hidden/OS cache files +.* +*~ +/nbproject +/nb-configuration.xml +Session.vim +*.tmproj +*.tmproject +tmtags +Thumbs.db +Desktop.ini + +# don't ignore travis config +!/.travis.yml |