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
..
migrate	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00
schema.rb	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00
seeds.rb	Added seeds.rb for an easy start.	2011-05-06 20:23:33 +02:00