updated and moved ignore file

diff --git a/.bzrignore b/.gitignore
similarity index 52%
rename from .bzrignore
rename to .gitignore
index 42f2b24ae1e026d9f320403cc576219156ff5d46..756e09a65416ca7f2b383d78a2a6ff2e562d917a 100644 (file)
--- a/.bzrignore
+++ b/.gitignore
@@ -1,14 +1,9 @@
 database.yml
-development.log
-production.log
-server.log
-test.log
 tmp
 public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update
-public/pictures
+public/pictures/*
 public/skin_pictures
-public/pictures
 help
-public/pictures/0000
+log/*