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
								
							 
						 | 
						
							
							
								
							
							
	d89a0449d0
						 | 
						
							
							
								
								
								htconfig.tpl - Friendika -> Friendica
							
							
							
							
							
						 | 
						
							2012-02-20 19:47:44 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	01cae9a50a
						 | 
						
							
							
								
								
								remove all plugins from default config
							
							
							
							
							
						 | 
						
							2011-12-12 16:28:33 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b795ce4fe7
						 | 
						
							
							
								
								
								little stuff - name change, live updates, new network types
							
							
							
							
							
						 | 
						
							2011-11-23 23:17:26 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c63adcfae0
						 | 
						
							
							
								
								
								bug #159 multiple definition of string_plural_form function when changing languages
							
							
							
							
							
						 | 
						
							2011-09-21 07:09:37 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Supler
								
							 
						 | 
						
							
							
								
							
							
	7813f1798f
						 | 
						
							
							
								
								
								minor changes of czech translations
							
							
							
							
							
						 | 
						
							2011-09-03 02:01:15 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Supler
								
							 
						 | 
						
							
							
								
							
							
	f3c5154f0c
						 | 
						
							
							
								
								
								added Czech translation of mail messages
							
							
							
							
							
						 | 
						
							2011-08-21 23:45:43 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	bddcc41518
						 | 
						
							
							
								
								
								Czech (cs) language
							
							
							
							
							
						 | 
						
							2011-05-29 20:36:21 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |