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
								
							 
						 | 
						
							
							
								
							
							
	6d507a840a
						 | 
						
							
							
								
								
								some doc updates
							
							
							
							
							
						 | 
						
							2011-11-08 14:12:01 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	cc1c015f20
						 | 
						
							
							
								
								
								@ completion is a bit too greedy
							
							
							
							
							
						 | 
						
							2011-11-05 21:43:58 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Abinoam P. Marques Jr.
								
							 
						 | 
						
							
							
								
							
							
	7f6e507457
						 | 
						
							
							
								
								
								Added addon installation instruction. Exclusive repo.
							
							
							
							
							
						 | 
						
							2011-09-27 00:18:08 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Abinoam P. Marques Jr.
								
							 
						 | 
						
							
							
								
							
							
	c52ef08578
						 | 
						
							
							
								
								
								Changing the git url to Free-Friendika at Install.md. It's lacking addon install instruction.
							
							
							
							
							
						 | 
						
							2011-09-26 23:51:46 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	767f165965
						 | 
						
							
							
								
								
								local documentation library
							
							
							
							
							
						 | 
						
							2011-04-13 07:07:21 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |