Merge branch 'develop'

# Conflicts: # config/version.php
Bumped version
2018-05-21 15:43:48 -07:00 · 2018-05-21 15:43:04 -07:00 · 2018-05-21 15:41:40 -07:00 · 2018-05-21 15:41:19 -07:00
2 changed files with 6 additions and 6 deletions
@@ -61,7 +61,7 @@ class SendExpectedCheckinAlerts extends Command
        // Send a rollup to the admin, if settings dictate
        $recipient = new \App\Models\Recipients\AlertRecipient();

-        if ($settings->alert_email!='') {
+        if (($assets) && ($assets->count() > 0) && ($settings->alert_email!='')) {
            $recipient->notify(new ExpectedCheckinAdminNotification($assets));
        }

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.4.0',
-  'full_app_version' => 'v4.4.0 - build 3630-ge63687579',
-  'build_version' => '3630',
+  'app_version' => 'v4.4.1',
+  'full_app_version' => 'v4.4.1 - build 3636-gece916e12',
+  'build_version' => '3636',
  'prerelease_version' => '',
-  'hash_version' => 'ge63687579',
-  'full_hash' => 'v4.3.0-48-ge63687579',
+  'hash_version' => 'gece916e12',
+  'full_hash' => 'v4.4.1-54-gece916e12',
  'branch' => 'master',
 );
Author	SHA1	Message	Date
snipe	2ecc4aead7	Merge branch 'develop' # Conflicts: # config/version.php	2018-05-21 15:43:48 -07:00
snipe	d8210847a4	Bumped version	2018-05-21 15:43:04 -07:00
snipe	ece916e12f	Merge branch 'develop'	2018-05-21 15:41:40 -07:00
snipe	1a29d4f60f	Check for > 0 expected assets	2018-05-21 15:41:19 -07:00