981944b869
Conflicts: Gemfile db/schema.rb |
||
---|---|---|
.. | ||
_archive_tasks.html.haml | ||
_form.html.haml | ||
_list.haml | ||
_nav.haml | ||
archive.haml | ||
archive.js.haml | ||
edit.haml | ||
index.haml | ||
new.haml | ||
show.haml | ||
user.html.haml | ||
workgroup.haml |
981944b869
Conflicts: Gemfile db/schema.rb |
||
---|---|---|
.. | ||
_archive_tasks.html.haml | ||
_form.html.haml | ||
_list.haml | ||
_nav.haml | ||
archive.haml | ||
archive.js.haml | ||
edit.haml | ||
index.haml | ||
new.haml | ||
show.haml | ||
user.html.haml | ||
workgroup.haml |