merge with upstream/frappe
This commit is contained in:
parent
a99216482d
commit
fe8bae82e8
1 changed files with 1 additions and 1 deletions
|
|
@ -12,7 +12,7 @@ from pyqrcode import create as qrcreate
|
|||
from six import StringIO
|
||||
from base64 import b64encode, b32encode
|
||||
from frappe.utils import get_url, get_datetime, time_diff_in_seconds
|
||||
from six import string_types
|
||||
from six import iteritems, string_types
|
||||
|
||||
class ExpiredLoginException(Exception): pass
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue