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
..
tasks	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00
templates/erb/scaffold	Added simple form for easier form building.	2011-05-14 17:06:32 +02:00
foodsoft_file.rb	Initial commit of foodsoft 2	2009-01-06 11:49:19 +01:00
wikilink.rb	Fixed hard coded links in wiki pages.	2010-03-22 03:11:32 +01:00