view .svn/pristine/f6/f6adde640ee0f6699f4137e3cbfb95a7427fe4fa.svn-base @ 1036:8526d7436527 cannam

Merge from branch "luisf"
author Chris Cannam
date Tue, 13 Nov 2012 14:09:25 +0000
parents cbb26bc654de
children
line wrap: on
line source
/.project
/.loadpath
/config/additional_environment.rb
/config/configuration.yml
/config/database.yml
/config/email.yml
/config/initializers/session_store.rb
/coverage
/db/*.db
/db/*.sqlite3
/db/schema.rb
/files/*
/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
/log/*.log*
/log/mongrel_debug
/public/dispatch.*
/public/plugin_assets
/tmp/*
/tmp/cache/*
/tmp/sessions/*
/tmp/sockets/*
/tmp/test/*
/vendor/rails
*.rbc

/.bundle
/Gemfile.lock
/Gemfile.local