diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-05 17:35:43 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-05 17:35:43 +0400 |
| commit | 3d7e3710a299efb4555c811908292b32cab556b4 (patch) | |
| tree | 60a049ee8495fc5e8997ce8fba0998e12cfd04d1 /misc | |
| parent | c4d8fe1c05d33589f831c8f8f36b986819bb2d9c (diff) | |
| parent | 3a1ed51ae871699aca5034c9ef9fcaeafa70bab4 (diff) | |
Merge branch 'master' into uiunittests
Conflicts:
piwik.js
plugins/SegmentEditor/javascripts/Segmentation.js
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index df2e437476..6b8cdee560 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -63,6 +63,7 @@ DOWNLOAD_EXTENSIONS = ( 'jar mpg mp2 mp3 mp4 mpeg mov movie msi msp odb odf odg odp ' 'ods odt ogg ogv pdf phps ppt qt qtm ra ram rar rpm sea sit tar tbz ' 'bz2 tbz tgz torrent txt wav wma wmv wpd xls xml xsd z zip' + 'azw3 epub mobi' ).split() |