Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into 1.8.7
Browse files Browse the repository at this point in the history
Conflicts:
	gems_list.txt
	vm/builtin/encoding.cpp
	vm/builtin/object.cpp
	vm/capi/string.cpp
	vm/marshal.cpp
  • Loading branch information
brixen committed Jun 19, 2015
2 parents 19b2cd1 + 47ac1f8 commit 8edd7cf
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 8edd7cf

Please sign in to comment.