friendica
								
							 
						 | 
						
							
							
								
							
							
	f07df4f667
						 | 
						
							
							
								
								
								merge
							
							
							
							
							
						 | 
						
							2013-03-02 15:46:54 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	71d44d78ec
						 | 
						
							
							
								
								
								Installed apps as array instead of string
							
							
							
							
							
						 | 
						
							2011-08-31 16:17:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	fb92dbf5d6
						 | 
						
							
							
								
								
								link events + personal notes to profile tabs
							
							
							
							
							
						 | 
						
							2011-06-13 20:32:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	dea721a3f8
						 | 
						
							
							
								
								
								minor fixes to apps (don't show notes if not logged in) and photos (tag delete link is leaking to unauthorised users)
							
							
							
							
							
						 | 
						
							2011-06-08 21:43:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	681885a120
						 | 
						
							
							
								
								
								"notes" app
							
							
							
							
							
						 | 
						
							2011-05-20 01:15:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	3d1b153dec
						 | 
						
							
							
								
								
								apps menu file
							
							
							
							
							
						 | 
						
							2011-02-19 01:01:33 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |