Skip to content
Snippets Groups Projects
Unverified Commit 73e00301 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'master' into admin-edit-identities


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
parents 3fe3cbf2 cc9b5c49
Branches
Tags
1 merge request!843Admin can see, edit and remove user identities
Pipeline #
Showing
with 436 additions and 221 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment