63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
development.rb.SAMPLE | ||
production.rb | ||
test.rb |
63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
development.rb.SAMPLE | ||
production.rb | ||
test.rb |