mirror of
				https://github.com/ether/etherpad-lite.git
				synced 2025-10-31 08:11:10 +01:00 
			
		
		
		
	Merge branch 'fix/editorloadingbox' into develop
This commit is contained in:
		
						commit
						aa986ab954
					
				| @ -299,11 +299,6 @@ | |||||||
|             <% e.end_block(); %> |             <% e.end_block(); %> | ||||||
|         </div> |         </div> | ||||||
| 
 | 
 | ||||||
|         <div id="editorcontainerbox"> |  | ||||||
|             <div id="editorcontainer"></div> |  | ||||||
|             <div id="editorloadingbox">Loading...</div> |  | ||||||
|         </div> |  | ||||||
| 
 |  | ||||||
|         <div id="chatthrob"></div> |         <div id="chatthrob"></div> | ||||||
| 
 | 
 | ||||||
|         <div id="chaticon" title="Open the chat for this pad" onclick="chat.show();return false;"> |         <div id="chaticon" title="Open the chat for this pad" onclick="chat.show();return false;"> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user