Merge branch 'master' into methodname-in-exception
This commit is contained in:
		
						commit
						f1ed16cbd0
					
				@ -2,8 +2,7 @@
 | 
			
		||||
# Google Test #
 | 
			
		||||
 | 
			
		||||
[](https://travis-ci.org/google/googletest)
 | 
			
		||||
[](https://ci.appveyor.com/project/google/googletest/branch/master)
 | 
			
		||||
 | 
			
		||||
[](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master)
 | 
			
		||||
 | 
			
		||||
Welcome to **Google Test**, Google's C++ test framework!
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user