Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

12 years ago · cca2e6c0fa
parent 10c37b4693 0af3d4488f
commit cca2e6c0fa
1 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,8 @@
 /log/*
 /test/*
 /tmp/*
-/public/images/requirements/*
-/public/images/avatars/*

+/config/database.yml
+/public/images/avatars/*
+/Gemfile
+/Gemfile.lock