resolve merge conflicts

2026-02-04 18:32:33 -05:00 · 2016-01-12 10:43:23 +00:00
parent 584533eb11 23c4cbbf76
commit bfd7291426
45 changed files with 448 additions and 231 deletions
--- a/config.py
+++ b/config.py
@@ -29,7 +29,7 @@ class Config(object):
    SECRET_KEY = 'secret-key'
    HTTP_PROTOCOL = 'http'
    DANGEROUS_SALT = 'itsdangeroussalt'
-    TOKEN_MAX_AGE_SECONDS = 120000
+    TOKEN_MAX_AGE_SECONDS = 3600

    MAX_CONTENT_LENGTH = 10 * 1024 * 1024  # 10mb