Merge branch 'develop'

This commit is contained in:
Tyler Renelle 2013-03-05 17:05:32 -05:00
commit df220b43df

View file

@ -61,7 +61,7 @@
</div>
<app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
{#if equals(_user.flags.petsEnabled,true)}
{#if equal(_user.flags.petsEnabled,true)}
<div class='tabbable tabs-below'>
<div class="tab-content">