| 
								
								
									 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 | 991656a3ef | Show "404.tpl" instead of using 'notice()' in case of 404 | 2011-09-19 11:52:32 +02:00 |  | 
				
					
						| 
								
								
									 fabrixxm | 07b6c868b3 | remove javascript to set selectect nav item. enanche img template prefetch ignoring | 2011-08-17 18:36:24 +02:00 |  | 
				
					
						| 
								
								
									 Friendika | 37a9a5ea62 | stupid browsers not honouring meta base | 2011-08-15 20:16:00 -07:00 |  | 
				
					
						| 
								
								
									 Friendika | 54368e3a0d | initial spanish translation | 2011-04-14 02:34:43 -07:00 |  | 
				
					
						| 
								
								
									 Friendika | 767f165965 | local documentation library | 2011-04-13 07:07:21 -07:00 |  |