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
								
							 
						 | 
						
							
							
								
							
							
	20d1de4ced
						 | 
						
							
							
								
								
								got it wrong - apparently no need to fix json slashes
							
							
							
							
							
						 | 
						
							2011-06-02 20:42:09 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2d4b3bee60
						 | 
						
							
							
								
								
								qsearch_limit, not lsearch
							
							
							
							
							
						 | 
						
							2011-02-28 23:39:59 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4efa0f1e81
						 | 
						
							
							
								
								
								newline at EOF
							
							
							
							
							
						 | 
						
							2011-02-25 19:57:44 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	597d09de1f
						 | 
						
							
							
								
								
								handle group results without parsing anything
							
							
							
							
							
						 | 
						
							2011-02-25 19:56:38 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ee4800a4d3
						 | 
						
							
							
								
								
								auto-complete contact/group endpoint
							
							
							
							
							
						 | 
						
							2011-02-25 15:28:07 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |