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
								
							 
						 | 
						
							
							
								
							
							
	d83bfd464b
						 | 
						
							
							
								
								
								zrl into people searches
							
							
							
							
							
						 | 
						
							2012-03-29 22:20:14 -07: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
								
							 
						 | 
						
							
							
								
							
							
	5d6a098ce0
						 | 
						
							
							
								
								
								add connect link to suggestion and matches
							
							
							
							
							
						 | 
						
							2011-12-18 01:44:46 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	974a52a16d
						 | 
						
							
							
								
								
								add connect link to friend suggest
							
							
							
							
							
						 | 
						
							2011-12-18 01:08:32 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	014c91431e
						 | 
						
							
							
								
								
								ignore suggestions
							
							
							
							
							
						 | 
						
							2011-11-03 16:00:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e38aa67263
						 | 
						
							
							
								
								
								link suggestions into the main code
							
							
							
							
							
						 | 
						
							2011-11-01 21:27:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	158028a0ac
						 | 
						
							
							
								
								
								first cut friend suggestions
							
							
							
							
							
						 | 
						
							2011-11-01 20:29:55 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |