Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8aa2552372
						 | 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
							
							
							
							
							
						 | 
						
							2012-01-18 16:21:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	fda593caed
						 | 
						
							
							
								
								
								introduction fails if confirmation differs by http vs https
							
							
							
							
							
						 | 
						
							2011-08-12 02:58:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	932397b47b
						 | 
						
							
							
								
								
								trim webfinger request
							
							
							
							
							
						 | 
						
							2011-06-27 19:47:55 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4418cb4349
						 | 
						
							
							
								
								
								preformat webfinger output
							
							
							
							
							
						 | 
						
							2011-06-27 18:13:44 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	7acb8fa6e7
						 | 
						
							
							
								
								
								add webfinger diagnostic module
							
							
							
							
							
						 | 
						
							2011-05-26 16:41:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |