Merge branch 'staging' into addon-to-plugin-conversion

# Conflicts: # plugins/MauticSocialBundle/Integration/TwitterIntegration.php
alanhartless · Aug 2, 2015 · 800a92f · 800a92f
1 parent 5ce210d
commit 800a92f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/MauticSocialBundle/Integration/TwitterIntegration.php b/plugins/MauticSocialBundle/Integration/TwitterIntegration.php
@@ -7,7 +7,7 @@
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace MauticAddon\MauticSocialBundle\Integration;
+namespace MauticPlugin\MauticSocialBundle\Integration;
 
 use Mautic\CoreBundle\Helper\EmojiHelper;