Skip to content
Snippets Groups Projects
Commit 10c5003c authored by Andre Angelantoni's avatar Andre Angelantoni
Browse files

Merge branch '1.3.x' into 1.0.x 

# Conflicts:
#	CHANGELOG.txt
#	cypress/e2e/atk_contact_us/atk_contact_us.cy.js
#	module_support/cypress.atk.config.js
parents 03fc5560 1939bb16
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 514 additions and 222 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment