simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e58f60b88
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	config.js
#	ssl/ca.cnf
#	ssl/create.sh
#	ssl/server.cnf 
						
					 | 
					
						2020-02-22 02:37:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							f53a42335b
							
						
					 | 
					
						
						
							
							fix(ssl): move files
						
						
						
						
						
					 | 
					
						2020-02-22 02:36:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cb807a555
							
						
					 | 
					
						
						
							
							fix: a lot of bug fixes, first running version for windows and android :)
						
						
						
						
						
						
						
						code is super ugly right now.. please don't judge 
						
					 | 
					
						2020-02-22 02:36:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							4989c2b6bc
							
						
					 | 
					
						
						
							
							fix: a lot of bug fixes, first running version for windows and android :)
						
						
						
						
						
						
						
						code is super ugly right now.. please don't judge 
						
					 | 
					
						2020-02-22 02:32:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							807e1508d7
							
						
					 | 
					
						
						
							
							initial commit
						
						
						
						
						
					 | 
					
						2020-02-15 00:20:24 +01:00 | 
					
					
						
						
							
							
							
						
					 |