diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-01-21 14:08:40 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-01-21 14:08:40 +0000 |
commit | c4551ae02edd3886e9892d203dcea9925e51dc00 (patch) | |
tree | 54733120cbf9a3d3d37fa533edfc86f1a4b572ae /config/environment.rb | |
parent | e6a6e432601f393b69a9f06b71130ad6cc064232 (diff) | |
parent | 3f5859847f0b559d771dba62265adb7d06194c1b (diff) |
Merge branch 'feature/remove-memcached-and-interlock-references' into develop
Diffstat (limited to 'config/environment.rb')
-rw-r--r-- | config/environment.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/environment.rb b/config/environment.rb index 21415dfd8..d1189c43f 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -114,8 +114,6 @@ end # Mime::Type.register "text/richtext", :rtf # Mime::Type.register "application/x-mobile", :mobile -# The Rails cache is set up by the Interlock plugin to use memcached - # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = Configuration::domain |