Skip to content
Snippets Groups Projects
Commit 69bde3f2 authored by Martin Schoeler's avatar Martin Schoeler
Browse files

Merge remote-tracking branch 'refs/remotes/origin/admin-tests' 

Conflicts:
	tests/steps/11-admin.js
parents c215df3e 4c75725c
No related merge requests found
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