friendica
								
							 
						 | 
						
							
							
								
							
							
	5589bca1e0
						 | 
						
							
							
								
								
								fix !@#$ tinymce linebreaks for the thousandth time
							
							
							
							
							
						 | 
						
							2012-07-04 17:15:43 -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
								
							 
						 | 
						
							
							
								
							
							
	63ea378d92
						 | 
						
							
							
								
								
								document tinymce fixes/workarounds
							
							
							
							
							
						 | 
						
							2012-04-01 04:13:27 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	03b95c9a09
						 | 
						
							
							
								
								
								translate br with extra elements
							
							
							
							
							
						 | 
						
							2012-03-26 16:56:44 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b4a2dae085
						 | 
						
							
							
								
								
								added README to mcefixes to explain what is going on.
							
							
							
							
							
						 | 
						
							2012-03-20 21:04:09 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f55779fd83
						 | 
						
							
							
								
								
								update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
							
							
							
							
							
						 | 
						
							2012-03-20 20:47:31 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |