63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
factories | ||
integration | ||
lib | ||
models | ||
support | ||
app_config.yml | ||
i18n_spec.rb | ||
spec_helper.rb |
63d52db91b
Conflicts: app/mailers/base_mailer.rb config/app_config.yml.SAMPLE spec/app_config.yml |
||
---|---|---|
.. | ||
factories | ||
integration | ||
lib | ||
models | ||
support | ||
app_config.yml | ||
i18n_spec.rb | ||
spec_helper.rb |