Merge remote-tracking branch 'origin/develop' into themes3

src/components/user_card/user_card.vue

@@ -124,11 +124,17 @@
                   {{ $t(`general.role.${visibleRole}`) }}
                 </span>
                 <span
-                  v-if="user.bot"
+                  v-if="user.actor_type === 'Service'"
                   class="alert neutral user-role"
                 >
                   {{ $t('user_card.bot') }}
                 </span>
+                <span
+                  v-if="user.actor_type === 'Group'"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.group') }}
+                </span>
               </template>
               <span v-if="user.locked">
                 <FAIcon