view .svn/pristine/e3/e35fda07d1a0e43c6b81ceebaae812062b4fed1d.svn-base @ 1386:e4c393cebb1a luisf

Merger from testing branch.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 24 Sep 2013 16:25:05 +0100
parents 038ba2d95de8
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
/config/initializers/secret_token.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/pdf/*
/tmp/sessions/*
/tmp/sockets/*
/tmp/test/*
/tmp/thumbnails/*
/vendor/cache
/vendor/rails
*.rbc

/.bundle
/Gemfile.lock
/Gemfile.local