gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-22 17:04:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ade
2014-09-23 17:53:53 +12:00
parent 394876992b 3f5044c82d
commit f6bb76acb0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/mb.py
+1 -1
View File
@@ -26,7 +26,7 @@ try:
from collections import OrderedDict from collections import OrderedDict
except ImportError: except ImportError:
# Python 2.6.x fallback, from libs # Python 2.6.x fallback, from libs
import OrderedDict from ordereddict import OrderedDict
mb_lock = threading.Lock() mb_lock = threading.Lock()
headphones/webserve.py
+1 -1
View File
@@ -37,7 +37,7 @@ try:
from collections import OrderedDict from collections import OrderedDict
except ImportError: except ImportError:
# Python 2.6.x fallback, from libs # Python 2.6.x fallback, from libs
import OrderedDict from ordereddict import OrderedDict
def serve_template(templatename, **kwargs): def serve_template(templatename, **kwargs):