| 
								
								
									 Michael Vogel | aed28a24f1 | Merge remote-tracking branch 'upstream/master' Conflicts:
	mod/crepair.php | 2014-01-05 16:22:42 +01: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 |  | 
				
					
						| 
								
								
									 Keith Fernie | 2c9cfb1fe9 | modified:   library/slinky.php Set up tabs in code correctly. | 2012-02-09 21:44:52 +00:00 |  | 
				
					
						| 
								
								
									 Keith Fernie | 955022e7dc | modified:   library/slinky.php Added a custom YourLS shortener to the available shorteners | 2012-02-09 20:45:38 +00: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 | 5f2f644064 | resolve file inclusion conflicts w/ multiple plugins, improve the typo checker | 2011-02-21 20:19:33 -08:00 |  |