Merged r4813 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4814 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Baptiste Barth 2011-02-12 09:03:36 +00:00
parent 6a8cdf54b3
commit e5b5b61d6e
2 changed files with 4 additions and 0 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
/.project
/.loadpath
/config/additional_environment.rb
/config/database.yml
/config/email.yml

View File

@ -1,5 +1,7 @@
syntax: glob
.project
.loadpath
config/additional_environment.rb
config/database.yml
config/email.yml