Merge branch 'master' of https://github.com/CJWorkbench/cjworkbench i…

…nto rad_socialaccount_i18n
CJWorkbench · Jan 20, 2020 · 1a008c9 · 1a008c9
2 parents a306b1d + 6f867a7
commit 1a008c9
Show file tree

Hide file tree

Showing 17 changed files with 841 additions and 563 deletions.
diff --git a/Pipfile b/Pipfile
@@ -48,7 +48,7 @@ six = "*"  # yajl-py depends on it but doesn't declare so. https://github.com/py
 pyroute2 = "*"
 pyspawner = "*"
 pyicu = "*"
-cjwmodule = "~=1.1.3"
+cjwmodule = "==1.2.1"
 
 [dev-packages]
 watchdog = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/cjwkernel/pandas/http/errors.py b/cjwkernel/pandas/http/errors.py