63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
documents | ||
helpers | ||
inputs | ||
mailers | ||
models | ||
views | ||
workers |
63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
documents | ||
helpers | ||
inputs | ||
mailers | ||
models | ||
views | ||
workers |