Skip to content
Snippets Groups Projects
Commit ece57b2e authored by Утеченко Виктор's avatar Утеченко Виктор
Browse files

Merge remote-tracking branch 'remotes/origin/master' into uiautotest 

# Conflicts:
#	apps/autotest/models/TST/_initialData/010_create_navshortcuts.js
#	apps/autotest/package.json
parents 3fce061e ce012c58
Pipeline #
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1210 additions and 960 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment