182742fbec
Conflicts: .gitignore app/models/task.rb app/models/workgroup.rb app/views/shared/_group_form.html.haml config/locales/de.yml db/schema.rb |
||
---|---|---|
.. | ||
_start_nav.haml | ||
_stats.erb | ||
index.html.haml | ||
ordergroup.html.erb | ||
ordergroup.js.erb | ||
profile.html.haml |