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
								
							 
						 | 
						
							
							
								
							
							
	1947b74e5b
						 | 
						
							
							
								
								
								some basic margins for friend suggestion screen
							
							
							
							
							
						 | 
						
							2011-06-27 16:18:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	14c002d7a4
						 | 
						
							
							
								
								
								make friend suggest themeable
							
							
							
							
							
						 | 
						
							2011-06-27 03:09:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	06a4c0f703
						 | 
						
							
							
								
								
								ignore current contact on friend suggestion picker
							
							
							
							
							
						 | 
						
							2011-06-27 03:03:58 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c410c9013c
						 | 
						
							
							
								
								
								friend suggestions
							
							
							
							
							
						 | 
						
							2011-06-26 22:57:08 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |