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 |
||
---|---|---|
.. | ||
fancybox | ||
sass | ||
.gitkeep | ||
ie_hacks.css | ||
jquery.fancybox-1.3.4.css | ||
main.css | ||
nav.css | ||
print.css | ||
rails_messages.css | ||
scaffold.css | ||
simple_form.css | ||
token-input.css |