Merge branch 'master' of https://github.com/Sebwite/Magento2-SmartSearch

Silvan Laroo · Silvan Laroo · commit c8ddb60b5cda · 2015-11-24T10:58:18.000+01:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@ Magento2 SmartSearch extension
 ##Todo's:
 * Retrieve currency symbol from Magento (now € is used)
 * Add config page
-* Show loading indicator
+* Show loading indicator
