Merge branch 'master' into dev

orvice · Mar 5, 2016 · 847c64e · 847c64e
2 parents b8ef0ef + 46f6a54
commit 847c64e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ss-panel
 
-Let's talk about cat.  Base on [LightFish](https://github.com/OzCat/LightFish)
+Let's talk about cat.  Based on [LightFish](https://github.com/OzCat/LightFish).
 
 [![Join the chat at https://gitter.im/orvice/ss-panel](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/orvice/ss-panel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

diff --git a/resources/views/default/user/node.tpl b/resources/views/default/user/node.tpl
@@ -74,7 +74,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="col-sm-5">
-                                                    <div class="progress-description">{$node->info}</div>
+                                                    <p>{$node->info}</p>
                                                 </div>
                                             </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,7 @@ @@
                                                         </div>
                                                     </div>
                                                     <div class="col-sm-5">
-                                                        <div class="progress-description">{$node->info}</div>
+                                                        <p>{$node->info}</p>
                                                     </div>
                                                 </div>
@@ Expand Down @@