tracks/config
Reinier Balt 4a485558e2 Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
	config/routes.rb
2013-06-17 09:25:02 +02:00
..
environments update configs for rails 4 2013-05-11 23:12:20 +02:00
initializers fix failing tests 2013-05-13 15:35:21 +02:00
locales fix failing tests 2013-06-11 15:36:27 +02:00
application.rb Start using actionpack-xml_parser as a gem 2013-05-13 15:36:33 +02:00
boot.rb update configs for rails 4 2013-05-11 23:12:20 +02:00
cucumber.yml set default format to progress for cucumber 2012-12-26 16:46:05 +01:00
database.yml.tmpl Use mysql for all databases in the template file 2012-10-09 12:22:07 -05:00
environment.rb update configs for rails 4 2013-05-11 23:12:20 +02:00
routes.rb Merge branch 'master' into rails4 2013-06-17 09:25:02 +02:00
site.yml.tmpl Use setting from stie.yml instead of hardcoded secret token 2013-05-07 09:21:22 +02:00