b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
1_settings.rb | ||
2_app.rb | ||
3_grit_ext.rb | ||
4_resque_queues.rb | ||
5_backend.rb | ||
backtrace_silencers.rb | ||
carrierwave.rb | ||
connection_fix.rb | ||
devise.rb | ||
inflections.rb | ||
mime_types.rb | ||
omniauth.rb.sample | ||
resque_authentication.rb | ||
resque_mailer.rb | ||
secret_token.rb | ||
session_store.rb | ||
wrap_parameters.rb |