Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branchs_developer

app/code/Joshine/Script/etc/di.xml

@@ -9,6 +9,9 @@
             <argument name="commands" xsi:type="array">
             <argument name="commands" xsi:type="array">
                 <item name="reviews-import" xsi:type="object">Joshine\Script\Console\Command\ReviewsImporter</item>
                 <item name="reviews-import" xsi:type="object">Joshine\Script\Console\Command\ReviewsImporter</item>
             </argument>
             </argument>
+            <argument name="commands" xsi:type="array">
+                <item name="instagram-pull" xsi:type="object">Joshine\Script\Console\Command\InstagramFeedPull</item>
+            </argument>
         </arguments>
         </arguments>
     </type>
     </type>
 </config>
 </config>
\ No newline at end of file

pub/.htaccess

@@ -271,4 +271,6 @@ ErrorDocument 403 /errors/404.php
 
 
     ## Prevent clickjacking
     ## Prevent clickjacking
     Header set X-Frame-Options SAMEORIGIN
     Header set X-Frame-Options SAMEORIGIN
+
+    Header add Access-Control-Allow-Origin "facebook.com"
 </IfModule>
 </IfModule>