Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle 2015-05-01 13:20:09 +02:00
commit 57f5e7a7d9

View File

@ -36,8 +36,9 @@ class UploadHandler:
try:
for root, _, files in os.walk(UploadHandler.image_directory()):
for filename in files:
image_file = os.path.join(root, filename)
uploaded_files.append(image_file)
if not filename.startswith("."):
image_file = os.path.join(root, filename)
uploaded_files.append(image_file)
except OSError:
pass
iourc_path = os.path.join(os.path.expanduser("~/"), ".iourc")