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

Merge branch 'develop' into 'feature/allow-moderation-on-user-page' 

# Conflicts:
#   src/api/users.js
#   src/store/modules/users.js
#   src/views/users/components/MultipleUsersMenu.vue
#   src/views/users/index.vue
parents 0e403604 ece7485a
No related branches found
No related tags found
1 merge request!85Add ability to moderate user on the user's page
This commit is part of merge request !85. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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