Merge branch 'master' into fix/setup-wizard-service-style-tweak

alexminza · Dec 29, 2017 · 6824b2a · 6824b2a
2 parents 7e45159 + eb60a17
commit 6824b2a
Show file tree

Hide file tree

Showing 112 changed files with 10,125 additions and 2,056 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,7 +4,7 @@ CHANGELOG.txt export-ignore
 composer.* export-ignore
 Gruntfile.js export-ignore
 package.json export-ignore
-phpcs.ruleset.xml export-ignore
+phpcs.xml export-ignore
 phpunit.* export-ignore
 README.md export-ignore
 tests export-ignore
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -278,9 +278,6 @@ module.exports = function( grunt ) {
 				bin: 'vendor/bin/phpcs'
 			},
 			dist: {
-				options: {
-					standard: './phpcs.ruleset.xml'
-				},
 				src:  [
 					'**/*.php',                                                  // Include all files
 					'!apigen/**',                                                // Exclude apigen/

diff --git a/assets/css/activation-rtl.css b/assets/css/activation-rtl.css
diff --git a/assets/css/activation.css b/assets/css/activation.css