Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1

bisq-network · Oct 12, 2017 · 482871a · 482871a
2 parents c79d9e9 + a8bcc4a
commit 482871a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 75 deletions.
diff --git a/common/src/main/java/io/bisq/common/locale/Res.java b/common/src/main/java/io/bisq/common/locale/Res.java
@@ -141,4 +141,4 @@ public ResourceBundle newBundle(String baseName, @NotNull Locale locale, @NotNul
         }
         return bundle;
     }
-}
+}
diff --git a/package/windows/bisq.iss b/package/windows/bisq.iss
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             return bundle;
         }
-    }
+    }