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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	c4a5fcaf27
						 | 
						
							
							
								
								
								fix xml poco for arrays
							
							
							
							
							
						 | 
						
							2011-12-18 00:39:15 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	978717a247
						 | 
						
							
							
								
								
								add webfinger to poco, if present
							
							
							
							
							
						 | 
						
							2011-12-18 00:14:34 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ea0ab6fbac
						 | 
						
							
							
								
								
								poco should now be spec compliant
							
							
							
							
							
						 | 
						
							2011-10-27 04:38:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	abe96155b4
						 | 
						
							
							
								
								
								hmmm - why won't poco xml work
							
							
							
							
							
						 | 
						
							2011-10-27 01:54:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |