Browse Source
			
			
			Merge branch 'master' into rocket-0.4
			
				# Conflicts:
#	Cargo.lock
			
			
				pull/284/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					7 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: FC8A7D14C3CD543A
						
					
				
			
		
		
		
	
		
			
				 1 changed files with 
1 additions and 
1 deletions
			 
			
		 
		
			
				- 
					
					
					 
					Cargo.lock
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -2483,7 +2483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					[[package]] | 
					 | 
					 | 
					[[package]] | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					name = "yubico" | 
					 | 
					 | 
					name = "yubico" | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					version = "0.4.0" | 
					 | 
					 | 
					version = "0.4.0" | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					source = "git+https://github.com/dani-garcia/yubico-rs#f93a88834e4ebaaed0169850ff1a5e32a7d01719" | 
					 | 
					 | 
					source = "git+https://github.com/dani-garcia/yubico-rs#a3a8143611f651d1ff6ec9a2d12599d0aaaea0c6" | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					dependencies = [ | 
					 | 
					 | 
					dependencies = [ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", | 
					 | 
					 | 
					 "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 
					 | 
					 | 
					 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |