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

Browse source

# Conflicts:
#   src/api/users.js
#   src/store/modules/users.js
#   src/views/users/components/MultipleUsersMenu.vue
#   src/views/users/index.vue

...

This commit is contained in:

Angelina Filippova 2020-01-28 18:37:14 +00:00

parent 0e4036040e ece7485a4c

commit 760d192c53

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available