Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts:
	lib/ruby/shared/krypt/hmac.rb
	lib/ruby/shared/krypt/provider.rb
  • Loading branch information...
commit be63f5804fdfd95508df6f365563198fd9b1594e 2 parents 4f50ea0 + fc93953
@headius headius authored
Showing with 0 additions and 0 deletions.
Please sign in to comment.
Something went wrong with that request. Please try again.