Merge branch 'master' into master
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -38,3 +38,6 @@ googletest/m4/lt~obsolete.m4
 | 
			
		||||
# Ignore generated directories.
 | 
			
		||||
googlemock/fused-src/
 | 
			
		||||
googletest/fused-src/
 | 
			
		||||
 | 
			
		||||
# macOS files
 | 
			
		||||
.DS_Store
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user