Merge branch 'master' of github.com:hyyan/woo-poly-integration

hyyan · Jun 15, 2017 · 7c47628 · 7c47628
2 parents 35cfb66 + c667790
commit 7c47628
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /nbproject/private/
-.php_cs.cache
+.php_cs.cache
+*.gif
diff --git a/assets/polylang-settings-sync.gif b/assets/polylang-settings-sync.gif
diff --git a/assets/product-attributes.gif b/assets/product-attributes.gif
diff --git a/assets/product-categories.gif b/assets/product-categories.gif
diff --git a/assets/strings-translations-attributes.gif b/assets/strings-translations-attributes.gif
diff --git a/assets/woo-poly-metas1.gif b/assets/woo-poly-metas1.gif
diff --git a/assets/woo-poly-metas2.gif b/assets/woo-poly-metas2.gif
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,11 +1,11 @@
-file.reference.subdomains-woopoly=../../..
-include.path=\
-    ${php.global.include.path}:\
-    ${file.reference.subdomains-woopoly}
-php.version=PHP_53
-project.licensePath=./nbproject/licenseheader.txt
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=false
-web.root=.
+file.reference.subdomains-woopoly=../../..
+include.path=\
+    ${php.global.include.path}:\
+    ${file.reference.subdomains-woopoly}
+php.version=PHP_53
+project.licensePath=./nbproject/licenseheader.txt
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.