Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
acts_as_taggable_on.rb
asset_sync.rb
assets.rb
backtrace_silencers.rb
carrierwave.rb
check_session_secret.rb
client_side_validations.rb
cors.rb
devise.rb
direction_detector.rb
enforce_ssl.rb
faraday.rb
ignore_ssl_in_development.rb
inflections.rb
json_escape.rb
json_patch.rb
load_analyitics.rb
load_mail_jobs.rb
locale.rb
mailer_config.rb
markerb.rb
mime_types.rb
monkey_patch_to_xs.rb
oembed.rb
omniauth.rb
patch_openssl_pkey.rb
rails_admin.rb
resque.rb
rspec_generator.rb
session_store.rb
set_up_image_redirects.rb
setup_mail.rb
silence_assets.rb
version_header.rb
will_paginate.rb