iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							283d5058e5
							
						
					 | 
					
						
						
							
							synchronized around cache clear in avatar service
						
						
						
						
						
					 | 
					
						2014-11-17 20:01:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2067b9bd8d
							
						
					 | 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity
						
						
						
						
						
					 | 
					
						2014-11-16 02:10:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc4f3702a8
							
						
					 | 
					
						
						
							
							made file transfers cancelable
						
						
						
						
						
					 | 
					
						2014-11-15 15:34:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a90ca429b
							
						
					 | 
					
						
						
							
							basic arbitrary file transfer
						
						
						
						
						
					 | 
					
						2014-11-15 15:34:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3582c970e
							
						
					 | 
					
						
						
							
							made qr code available from muc and contact details as well
						
						
						
						
						
					 | 
					
						2014-11-04 12:15:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							d458919c8f
							
						
					 | 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete
						
						
						
						
						
					 | 
					
						2014-11-03 22:47:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							46f147a82c
							
						
					 | 
					
						
						
							
							Merge branch 'gradle' into development
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 | 
					
						2014-10-30 15:33:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							281ce3105f
							
						
					 | 
					
						
						
							
							Make conversations the root project
						
						
						
						
						
					 | 
					
						2014-10-22 15:47:11 -04:00 | 
					
					
						
						
							
							
							
						
					 |