Commit bd48dcd5 authored by abirembaut's avatar abirembaut
Browse files

Merge branch '7.12.x'

parents 53e51d92 153b8eee
......@@ -13,4 +13,4 @@
"viewportWidth": 1366,
"testFiles": "**/*.feature",
"chromeWebSecurity": false
\ No newline at end of file
Markdown is supported
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