Merge branch 'release/1.2.0'

Nosto · Feb 10, 2015 · 073bd55 · 073bd55
2 parents 0f49e6a + 604f512
commit 073bd55
Show file tree

Hide file tree

Showing 94 changed files with 5,195 additions and 1,011 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/Nosto_Tagging/code/community/Nosto/Tagging/Block/Embed.php b/Nosto_Tagging/code/community/Nosto/Tagging/Block/Embed.php
diff --git a/Nosto_Tagging/code/community/Nosto/Tagging/Block/Product.php b/Nosto_Tagging/code/community/Nosto/Tagging/Block/Product.php
diff --git a/Nosto_Tagging/code/community/Nosto/Tagging/Helper/Data.php b/Nosto_Tagging/code/community/Nosto/Tagging/Helper/Data.php
diff --git a/Nosto_Tagging/code/community/Nosto/Tagging/Model/Config/Account.php b/Nosto_Tagging/code/community/Nosto/Tagging/Model/Config/Account.php