Jaroslav Lichtblau
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f34f93c3a
							
						
					 | 
					
						
						
							
							pref_about_message string deleted
						
						
						
						
						
					 | 
					
						2014-12-01 21:42:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaroslav Lichtblau
							
						 
					 | 
					
						
						
						
						
							
						
						
							59a112ebfe
							
						
					 | 
					
						
						
							
							Updated Czech translation file
						
						
						
						
						
						
						
						added missing strings
fixing typos, improvements for better understanding 
						
					 | 
					
						2014-12-01 16:46:17 +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 | 
					
					
						
						
							
							
							
						
					 |