Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						37867634cd
					 | 
					
						
						
							
							Merge branch 'master' into nonet
						
						
						
						
						
						
						
						Conflicts:
	src/keepass2android/Properties/AndroidManifest_nonet.xml 
						
						
					 | 
					
						2018-06-18 13:08:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robin Schneider
							
						 
					 | 
					
						
						
							
						
						802e3d04b2
					 | 
					
						
						
							
							Fix typo in README.md
						
						
						
						
						
						
					 | 
					
						2018-03-31 22:19:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PhilippC
							
						 
					 | 
					
						
						
							
						
						ba56ab719c
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2018-03-12 11:36:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PhilippC
							
						 
					 | 
					
						
						
							
						
						617c053b95
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2018-03-12 11:36:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PhilippC
							
						 
					 | 
					
						
						
							
						
						868cff2c4c
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2018-03-12 11:36:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						ff8dc76c75
					 | 
					
						
						
							
							Merge branch 'master' into nonet
						
						
						
						
						
						
						
						Conflicts:
	docs/README.md 
						
						
					 | 
					
						2017-12-02 14:25:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sven Luijten
							
						 
					 | 
					
						
						
							
						
						8677aa1bca
					 | 
					
						
						
							
							fix link to plugin file
						
						
						
						
						
						
					 | 
					
						2017-10-25 20:11:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						9716130336
					 | 
					
						
						
							
							remove references to libraries only required for online build, adjust build script and README
						
						
						
						
						
						
					 | 
					
						2017-10-25 06:23:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						6f47163591
					 | 
					
						
						
							
							Add build status in README.md
						
						
						
						
						
						
					 | 
					
						2017-10-24 04:46:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						80fd232417
					 | 
					
						
						
							
							fix links
						
						
						
						
						
						
					 | 
					
						2017-09-21 23:51:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Crocoll
							
						 
					 | 
					
						
						
							
						
						847ccac6b7
					 | 
					
						
						
							
							documentation, exported from Codeplex and updated
						
						
						
						
						
						
					 | 
					
						2017-09-21 23:41:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |