summaryrefslogtreecommitdiffhomepage
path: root/libs/version.txt
diff options
context:
space:
mode:
authorMichiel van Baak <[email protected]>2020-02-15 11:26:58 +0100
committerMichiel van Baak <[email protected]>2020-02-15 11:26:58 +0100
commit40dbfa7e0bc0b70f7aef26a41cab18909a167794 (patch)
treeb5825a8f3ac3d65ff6792363cfe61fa45d739000 /libs/version.txt
parentd2664807ab1498b8f050ca3a33419c38348a7958 (diff)
downloadbazarr-40dbfa7e0bc0b70f7aef26a41cab18909a167794.tar.gz
bazarr-40dbfa7e0bc0b70f7aef26a41cab18909a167794.zip
Document the manual merge of upstream PR to Js2Py
Diffstat (limited to 'libs/version.txt')
-rw-r--r--libs/version.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/version.txt b/libs/version.txt
index 4aecf42ad..d4c869b982 100644
--- a/libs/version.txt
+++ b/libs/version.txt
@@ -27,4 +27,4 @@ stevedore=1.28.0
subliminal=2.1.0dev
tzlocal=1.5.1
urllib3=1.23
-Js2Py=0.63
+Js2Py=0.63 <-- modified: manually merged from upstream: https://github.com/PiotrDabkowski/Js2Py/pull/192/files