mirror of
				https://github.com/teamcapybara/capybara.git
				synced 2022-11-09 12:08:07 -05:00 
			
		
		
		
	Merge remote branch 'jgagner/master'
Conflicts: lib/capybara/driver/selenium_driver.rb lib/capybara/session.rb spec/driver/selenium_driver_spec.rb
This commit is contained in:
		
						commit
						67a2076ecc
					
				
					 9 changed files with 85 additions and 5 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -1,3 +1,4 @@
 | 
			
		|||
.idea/
 | 
			
		||||
.DS_Store
 | 
			
		||||
pkg
 | 
			
		||||
*~
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue