Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks ... Conflicts: config/locales/de.yml		2013-06-12 10:00:11 +02:00
..
.gitkeep	First step for upgrading to rails 3.	2011-05-11 01:32:21 +02:00
foodsoft.rake	Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks	2013-06-12 10:00:11 +02:00
foodsoft_setup.rake	adds mailcatcher to foodsoft:setup_development	2013-05-29 12:35:16 +02:00
multicoops.rake	Fixed multicoops and resque rake tasks.	2013-01-07 13:44:46 +01:00
rails.rake	Initial commit of foodsoft 2	2009-01-06 11:49:19 +01:00
resque.rake	Fixed multicoops and resque rake tasks.	2013-01-07 13:44:46 +01:00