tracks/config
Reinier Balt 29acdc5a9d Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/views/layouts/application.html.erb
2014-06-26 10:56:22 +02:00
..
environments remove custom solution to visually show that you are running in development 2014-06-26 10:05:22 +02:00
initializers Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
locales Merge branch 'master' into new-gui 2014-04-02 13:26:17 -04:00
application.rb Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
boot.rb Bring a few details in line with Rails 4.1 2014-06-19 12:33:38 -04: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 Bring a few details in line with Rails 4.1 2014-06-19 12:33:38 -04:00
routes.rb Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
site.yml.tmpl Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00