Merge commit '8d78020e2eebd3ad8e7e73a8dd5f43e40ec74b38' into merge-login

woocommerce · Apr 16, 2018 · 3d1d5e5 · 3d1d5e5
2 parents 5232ef7 + 43e4bd4
commit 3d1d5e5
Show file tree

Hide file tree

Showing 3 changed files with 271 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ captures/
 
 # IntelliJ/Android Studio exceptions
 !/.idea/vcs.xml
+!/.idea/codeStyles/
 !/.idea/fileTemplates/
 !/.idea/inspectionProfiles/
 !/.idea/scopes/

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml