1
1
mirror of https://github.com/github/semantic.git synced 2024-12-20 05:11:44 +03:00
Commit Graph

1 Commits

Author SHA1 Message Date
Rob Rix
62196878fa Merge branch 'master' into ghc8
# Conflicts:
#	semantic-diff.cabal
#	src/Diff.hs
#	src/Term.hs
#	src/Term/Arbitrary.hs
#	stack.yaml
#	tools/semantic-git-diff/src/SemanticDiff.hs
2016-09-14 16:12:47 -04:00