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

Merge branch 'master' into 'feature/invites' 

# Conflicts:
#   src/router/index.js
parents 497176e5 7e159ac1
No related branches found
No related tags found
1 merge request!45Generate invite tokens from admin-fe
This commit is part of merge request !45. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 971 additions and 6 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