cbd78922ee
Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
models | ||
uploaders | ||
views | ||
workers |
cbd78922ee
Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
models | ||
uploaders | ||
views | ||
workers |