Merge remote-tracking branch 'origin/master' into socket.io1.x

10 years ago · 5521e6143f
parent 0674258793 033e078aeb
commit 5521e6143f
2 changed files with 3 additions and 3 deletions
--- a/public/less/admin/manage/users.less
+++ b/public/less/admin/manage/users.less
@ -1,6 +1,6 @@
-.users {
+.manage-users {
 	min-height: 500px;
-	
+
 	#users-container {
 		border: 1px solid #eee;
 		padding: 0px 20px 20px;
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@ -1,4 +1,4 @@
-<div class="users">
+<div class="manage-users">
 	<div class="col-lg-9">
 		<div class="panel panel-default">
 			<div class="panel-heading"><i class="fa fa-user"></i> Users</div>