Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a6b03b6263
						 | 
						
							
							
								
								
								The remove page now has the settings menu.
							
							
							
							
							
						 | 
						
							2014-04-29 22:34:48 +02: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
								
							 
						 | 
						
							
							
								
							
							
	068cb53a9e
						 | 
						
							
							
								
								
								page delegation
							
							
							
							
							
						 | 
						
							2012-01-26 20:08:02 -08: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
								
							 
						 | 
						
							
							
								
							
							
	2637831d90
						 | 
						
							
							
								
								
								some more zot changes migrating back to f9a mainline
							
							
							
							
							
						 | 
						
							2011-08-01 21:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b2e92e0af3
						 | 
						
							
							
								
								
								deprecate load_view_file
							
							
							
							
							
						 | 
						
							2011-05-11 04:37:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c052d68828
						 | 
						
							
							
								
								
								don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
							
							
							
							
							
						 | 
						
							2011-05-10 16:12:50 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a4cbdc2414
						 | 
						
							
							
								
								
								remove self
							
							
							
							
							
						 | 
						
							2011-02-03 03:58:47 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |