Merge branch 'fix-hide-network' into 'develop'

oof

See merge request pleroma/pleroma-fe!422
This commit is contained in:
HJ 2018-12-14 14:51:59 +00:00
commit 10a0296aac

View file

@ -31,7 +31,7 @@
</p> </p>
<p> <p>
<input type="checkbox" v-model="newHideNetwork" id="account-hide-network"> <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
<label for="account-no-rich-text">{{$t('settings.hide_network_description')}}</label> <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
</p> </p>
<button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
</div> </div>