Merge branch 'master' of https://github.com/designcreateplay/NodeBB

12 years ago · 34777fa844
parent ea4f39ca21 002695234b
commit 34777fa844
2 changed files with 3 additions and 1 deletions
--- a/public/css/style.less
+++ b/public/css/style.less
@ -320,6 +320,7 @@ footer.footer {
 	background: #56BCDA;
 	color: white;
 	padding: 30px;
 	word-wrap: break-word;
 }
 .users-box{
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@ -170,6 +170,7 @@ define(['taskbar'], function(taskbar) {
 			socket.emit('api:composer.editCheck', post_data.pid);
 		} else {
 			titleEl.value = post_data.title;
 			titleEl.readOnly = false;
 		}
 		bodyEl.value = post_data.body