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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fabrixxm
							
						 
					 | 
					
						
						
							
						
						d6b4940ddd
					 | 
					
						
						
							
							extract.php extract tt(). Updated strings.php
						
						
						
						
						
						
					 | 
					
						2011-03-13 13:51:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Friendika
							
						 
					 | 
					
						
						
							
						
						33037754d8
					 | 
					
						
						
							
							removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default.
						
						
						
						
						
						
					 | 
					
						2011-01-27 18:45:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Macgirvin
							
						 
					 | 
					
						
						
							
						
						e25e40f1ef
					 | 
					
						
						
							
							i18n string extraction util
						
						
						
						
						
						
					 | 
					
						2010-09-29 18:11:23 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |