Merge branch 'master' of https://github.com/gorhill/uMatrix

gorhill · Jun 24, 2016 · 2ef2505 · 2ef2505
2 parents 5bb96c1 + cf4bb05
commit 2ef2505
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/js/user-rules.js b/src/js/user-rules.js
@@ -179,7 +179,7 @@ var handleImportFilePicker = function() {
     if ( file === undefined || file.name === '' ) {
         return;
     }
-    if ( file.type.indexOf('text') !== 0 ) {
+    if ( file.type.indexOf('text') !== 0 && file.type !== 'application/json') {
         return;
     }
     var fr = new FileReader();