Merge branch 'master' into production

Screenly · Sep 26, 2019 · 6c2c2fd · 6c2c2fd
2 parents 3a57cb4 + ccf5220
commit 6c2c2fd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 48 deletions.
diff --git a/bin/prepare_device_for_imaging.sh b/bin/prepare_device_for_imaging.sh
diff --git a/server.py b/server.py
@@ -627,7 +627,7 @@ def add_default_assets():
     datetime_now = datetime.now()
     default_asset_settings = {
         'start_date': datetime_now,
-        'end_date': datetime_now + timedelta(days=7),
+        'end_date': datetime_now.replace(year=datetime_now.year + 6),
         'duration': settings['default_duration']
     }