61c85332d2
Conflicts: app/controllers/admin/mailer_controller.rb app/controllers/notes_controller.rb |
||
---|---|---|
.. | ||
assets | ||
contexts | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
models | ||
observers | ||
roles | ||
uploaders | ||
views | ||
workers |
61c85332d2
Conflicts: app/controllers/admin/mailer_controller.rb app/controllers/notes_controller.rb |
||
---|---|---|
.. | ||
assets | ||
contexts | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
models | ||
observers | ||
roles | ||
uploaders | ||
views | ||
workers |