Merge branch 'master' into develop

Miller-Media · Apr 30, 2020 · 9914bc3 · 9914bc3
2 parents 26e1886 + 88074cd
commit 9914bc3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/wpMandrill.class.php b/lib/wpMandrill.class.php
@@ -18,7 +18,6 @@ static function on_load() {
 
         add_action('admin_init', array(__CLASS__, 'adminInit'));
         add_action('admin_menu', array(__CLASS__, 'adminMenu'));
-        add_action('admin_notices', array(__CLASS__, 'adminNotices'));
 
         add_action('admin_print_footer_scripts', array(__CLASS__,'openContextualHelp'));
         add_action('wp_ajax_get_mandrill_stats', array(__CLASS__,'getAjaxStats'));

diff --git a/wpmandrill.php b/wpmandrill.php
@@ -4,7 +4,7 @@
 Description: Send e-mails using Mandrill. This is a forked version of the now unsupported plugin <a href="https://wordpress.org/plugins/wpmandrill/">wpMandrill</a>.
 Author: Miller Media ( Matt Miller )
 Author URI: http://www.millermedia.io
-Version: 1.2.6
+Version: 1.2.8
 Requires PHP: 5.6
 Text Domain: send-emails-with-mandrill
 */