friendica
								
							 
						 | 
						
							
							
								
							
							
	2347a4326c
						 | 
						
							
							
								
								
								get rid of 'Friendika'
							
							
							
							
							
						 | 
						
							2012-10-18 21:51:45 -07: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
								
							 
						 | 
						
							
							
								
							
							
	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
								
							 
						 | 
						
							
							
								
							
							
	42613902ed
						 | 
						
							
							
								
								
								sv update
							
							
							
							
							
						 | 
						
							2011-04-18 15:35:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b81eefbffb
						 | 
						
							
							
								
								
								sv language had unquoted quotes in strings
							
							
							
							
							
						 | 
						
							2011-04-17 23:38:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c347a5d6c9
						 | 
						
							
							
								
								
								sv language update
							
							
							
							
							
						 | 
						
							2011-04-16 15:57:24 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	6728a11ee3
						 | 
						
							
							
								
								
								support feed attachments/enclosures, and fix for bug #30
							
							
							
							
							
						 | 
						
							2011-04-06 19:42:35 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	1bba63fb60
						 | 
						
							
							
								
								
								Merge branch 'erikl-master'
							
							
							
							
							
							
							
							Conflicts:
	view/sv/settings.tpl 
							
						 | 
						
							2011-04-04 15:46:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	0de12cd297
						 | 
						
							
							
								
								
								Edited view/sv/strings.php via GitHub
							
							
							
							
							
						 | 
						
							2011-04-04 12:51:58 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	b2f6bf7c38
						 | 
						
							
							
								
								
								Edited view/sv/strings.php via GitHub
							
							
							
							
							
						 | 
						
							2011-04-03 06:01:56 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	89103c99ef
						 | 
						
							
							
								
								
								Edited view/sv/strings.php via GitHub
							
							
							
							
							
						 | 
						
							2011-04-01 11:33:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	067626380d
						 | 
						
							
							
								
								
								Merge branch 'erikl-master'
							
							
							
							
							
							
							
							Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php 
							
						 | 
						
							2011-03-24 04:36:53 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	af12c696cb
						 | 
						
							
							
								
								
								Edited view/sv/strings.php via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 14:12:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	26f0b37738
						 | 
						
							
							
								
								
								commit001
							
							
							
							
							
						 | 
						
							2011-03-22 18:09:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	a5bca7ea4e
						 | 
						
							
							
								
								
								commit001
							
							
							
							
							
						 | 
						
							2011-03-22 18:09:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0bce69fe9c
						 | 
						
							
							
								
								
								swedush string update via erikl
							
							
							
							
							
						 | 
						
							2011-03-17 14:55:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	6b37e6d48d
						 | 
						
							
							
								
								
								Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
							
							
							
							
							
							
							
							Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php 
							
						 | 
						
							2011-03-17 14:44:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a912a0d3ca
						 | 
						
							
							
								
								
								Swedish translation
							
							
							
							
							
						 | 
						
							2011-03-12 03:15:38 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	e94ae8d396
						 | 
						
							
							
								
								
								commit001
							
							
							
							
							
						 | 
						
							2011-03-11 20:12:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |