You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		7 years ago
..
active_model_serializers.rb	…
application_controller_renderer.rb	…
assets.rb	HTML e-mails for UserMailer (#6256)	7 years ago
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	…
cookies_serializer.rb	…
cors.rb	…
devise.rb	…
doorkeeper.rb	…
fast_blank.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	…
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
ostatus.rb	…
pagination.rb	…
paperclip.rb	…
premailer_rails.rb	…
rack_attack.rb	…
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	…
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
timeout.rb	…
trusted_proxies.rb	…
twitter_regex.rb	…
vapid.rb	…
wrap_parameters.rb	…