Reinier Balt 463f5e922d Merge branch 'master' into new-gui ... Conflicts: Gemfile.lock		2013-09-22 10:30:24 +02:00
..
environments	update configs for rails 4	2013-05-11 23:12:20 +02:00
initializers	change version to 3.0devel	2013-07-29 12:25:33 +02:00
locales	i18n changes	2013-07-28 13:28:15 +02:00
application.rb	change version to 3.0devel	2013-07-29 12:25: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 new-gui	2013-09-22 10:30:24 +02:00
site.yml.tmpl	Add Mailgun endpoint for receiving email tasks via Mailgun	2013-09-21 12:43:22 +01:00