Merge branch 'develop' of github.com:lefnire/habitrpg into develop

This commit is contained in:
Tyler Renelle
2013-03-17 22:10:04 -04:00
+2 -2
View File
@@ -19,7 +19,7 @@
<hr/>
<h4>Misc</h4>
<button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
<button x-bind="click:toggleHeader" class="btn">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
{#unless _user.flags.partyEnabled}&nbsp;<button x-bind="click:manuallyUnlockParties" data-dismiss='modal' rel=tooltip title="Parties are unlocked automatically for usability reasons, but you can override that here.">Enable Parties</button>{/}
{{#if _user.auth.local}}
@@ -157,4 +157,4 @@
</ul>
</div>
{/}
</div>
</div>