Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history 
# Conflicts:
#	tool/jt.rb
@chrisseaton
chrisseaton committed Dec 7, 2015
2 parents 1cd2a04 + 75e58f6 commit 30f9ea7
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 30f9ea7

Please sign in to comment.