fix nitpick and merge master

lms/templates/discussion/mustache/_inline_thread_show.mustache

@@ -3,8 +3,8 @@
     <header>
         <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>{{votes.up_count}}</span></a>
         <h3>{{title}}</h3>
-<div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
-<i class="icon"></i><span class="pin-label">Pinned</span></div>
+        <div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
+        <i class="icon"></i><span class="pin-label">Pinned</span></div>
 
         <p class="posted-details">
             {{#user}}