benni 182742fbec Merge branch 'master' into rails3 ... Conflicts: .gitignore app/models/task.rb app/models/workgroup.rb app/views/shared/_group_form.html.haml config/locales/de.yml db/schema.rb		2012-06-26 11:51:56 +02:00
..
.gitkeep	First step for upgrading to rails 3.	2011-05-11 01:32:21 +02:00
foodsoft.rake	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00
messages.rake	Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.	2009-01-15 18:26:37 +01:00
rails.rake	Initial commit of foodsoft 2	2009-01-06 11:49:19 +01:00