iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c48407f3b4
							
						
					 | 
					
						
						
							
							Merge branch 'development' of https://github.com/siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-11-03 20:28:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							696dd07a41
							
						
					 | 
					
						
						
							
							basic beam code / untested
						
						
						
						
						
					 | 
					
						2014-11-03 20:00:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec9c264cf7
							
						
					 | 
					
						
						
							
							more error handling for http connection
						
						
						
						
						
					 | 
					
						2014-11-03 19:59:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							39ae34d3e6
							
						
					 | 
					
						
						
							
							Wrap "last seen" time.
						
						
						
						
						
						
						
						Fixes #611 
						
					 | 
					
						2014-11-03 08:28:20 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e05ef77b1
							
						
					 | 
					
						
						
							
							version bump to 0.8.1
						
						
						
						
						
					 | 
					
						2014-11-03 11:20:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							49920649db
							
						
					 | 
					
						
						
							
							always use exif helper
						
						
						
						
						
					 | 
					
						2014-11-03 11:20:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							27f42dfb63
							
						
					 | 
					
						
						
							
							more error handling in xmppconnection
						
						
						
						
						
					 | 
					
						2014-11-03 10:03:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ea2e7dc3b
							
						
					 | 
					
						
						
							
							fixed arrayoutofbounds + spelling
						
						
						
						
						
					 | 
					
						2014-11-01 14:33:34 +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 | 
					
					
						
						
							
							
							
						
					 |