Merge from master

This commit is contained in:
Hillel Coren 2017-08-07 18:09:41 +03:00
parent 4f59017adb
commit 2a1019cfa0

View File

@ -193,8 +193,8 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
{!! Former::textarea('public_notes')->rows($account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!} {!! Former::textarea('private_notes')->rows(! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!}
{!! Former::textarea('private_notes')->rows($account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!} {!! Former::textarea('public_notes')->rows(! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!}
@if (! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS)) @if (! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS))
<div class="form-group"> <div class="form-group">