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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Abinoam P. Marques Jr
								
							 
						 | 
						
							
							
								
							
							
	7404d76126
						 | 
						
							
							
								
								
								util/README - Friendika -> Friendica
							
							
							
							
							
						 | 
						
							2012-02-20 19:47:56 -03: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Olivier Migeot
								
							 
						 | 
						
							
							
								
							
							
	ddf13d8c97
						 | 
						
							
							
								
								
								Some corrections to PO workflow, and integrated latest templates "stringization" for french.
							
							
							
							
							
						 | 
						
							2011-03-30 16:46:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0f8bcacfdd
						 | 
						
							
							
								
								
								util/README updated
							
							
							
							
							
						 | 
						
							2011-03-28 16:10:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	6a56ac2add
						 | 
						
							
							
								
								
								language file security
							
							
							
							
							
						 | 
						
							2011-03-19 15:12:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	be67cf663b
						 | 
						
							
							
								
								
								minor edits
							
							
							
							
							
						 | 
						
							2011-03-19 05:10:05 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	e307846c2d
						 | 
						
							
							
								
								
								Updated utils/README
							
							
							
							
							
						 | 
						
							2011-03-18 12:36:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4afb9c5087
						 | 
						
							
							
								
								
								update i18n notes with recent changes
							
							
							
							
							
						 | 
						
							2010-11-20 15:23:41 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	c7c3db8c54
						 | 
						
							
							
								
								
								i18n officially ready for prime time.
							
							
							
							
							
						 | 
						
							2010-10-06 17:40:58 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	d2ecdd0668
						 | 
						
							
							
								
								
								doco on the utils dir and i18n
							
							
							
							
							
						 | 
						
							2010-09-29 18:35:21 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |