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
..
controllers	Simplify balancing view. Part 1 of ...	2012-06-21 17:19:00 +02:00
helpers	Simplify balancing view. Part 1 of ...	2012-06-21 17:19:00 +02:00
mailers	Replaced protoype with jquery. Some fixes in mailer class.	2011-05-11 15:14:39 +02:00
models	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00
views	Merge branch 'master' into rails3	2012-06-26 11:51:56 +02:00