Commit a5651492 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge changes from topic 'upgrade-hamcrest-to-2.0' 

* changes:
  Allow JUnit to compile against external/hamcrest v2.0
  Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"
parents 7323bf63 ccc794a9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment