Merge master into rbac

This commit is contained in:
Min RK
2021-01-27 12:39:02 +01:00
27 changed files with 328 additions and 74 deletions

View File

@@ -400,7 +400,7 @@ class Expiring:
which should be unix timestamp or datetime object
"""
now = utcnow # funciton, must return float timestamp or datetime
now = utcnow # function, must return float timestamp or datetime
expires_at = None # must be defined
@property