Skip to content
Snippets Groups Projects
Commit 12bac96c authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Merge branch 'develop' into 'feature/do-not-show-users-with-null-nicknames' 

# Conflicts:
#   src/components/Status/index.vue
#   src/views/users/components/ModerationDropdown.vue
#   src/views/users/show.vue
parents cd126c10 77646e3d
No related branches found
No related tags found
1 merge request!133Update displaying and managing accounts with invalid nicknames
Pipeline #26883 failed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 757 additions and 191 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment