Merge branch 'develop' into release

This commit is contained in:
Sabe Jones
2020-04-30 12:40:02 -05:00
227 changed files with 7301 additions and 10131 deletions

View File

@@ -72,8 +72,8 @@
/>
</div>
<button
class="btn btn-secondary"
v-if="canLoadMoreConversations"
class="btn btn-secondary"
@click="loadConversations()"
>
{{ $t('loadMore') }}