Skip to content
Snippets Groups Projects
Commit 9368f44f authored by Laurent's avatar Laurent
Browse files

Merge branch 'stable'

Conflicts:
	application/modules/admin/views/scripts/users/index.phtml
	tests/application/modules/admin/controllers/UsersControllerTest.php
parents b03efe0f 183b8780
Branches
Tags
No related merge requests found
Pipeline #2527 passed with stage
in 22 minutes and 4 seconds
Showing
with 494 additions and 312 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