Merge tag 'v3.1.2' into hometown-dev

This commit is contained in:
Darius Kazemi
2020-03-02 10:01:54 -08:00
33 changed files with 571 additions and 394 deletions

View File

@ -27,9 +27,9 @@
= fa_icon 'check'
= Formatter.instance.format_field(account, field.value, custom_emojify: true)
- if account.note.present?
%div
.account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
- if account.note.present?
%div
.account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
.dashboard__counters{ style: 'margin-top: 10px' }
%div