Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev

This commit is contained in:
Dan 2020-11-19 11:26:11 -05:00
commit cc6f1a926c
2 changed files with 3 additions and 3 deletions

View File

@ -39,7 +39,7 @@ requests = "*"
sentry-sdk = {extras = ["flask"],version = "==0.14.4"} sentry-sdk = {extras = ["flask"],version = "==0.14.4"}
sphinx = "*" sphinx = "*"
swagger-ui-bundle = "*" swagger-ui-bundle = "*"
spiffworkflow = {git = "https://github.com/sartography/SpiffWorkflow.git",ref = "cancel-event"} spiffworkflow = {git = "https://github.com/sartography/SpiffWorkflow.git",ref = "master"}
webtest = "*" webtest = "*"
werkzeug = "*" werkzeug = "*"
xlrd = "*" xlrd = "*"

4
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "263e8627b483ddc81a2016eb4da3e6738140b449c9c4be13a7a62a9191f171cd" "sha256": "621d57ec513f24c665dd34e08ae5a19fc27784e87c55bb4d2a91a1d48a473081"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -837,7 +837,7 @@
}, },
"spiffworkflow": { "spiffworkflow": {
"git": "https://github.com/sartography/SpiffWorkflow.git", "git": "https://github.com/sartography/SpiffWorkflow.git",
"ref": "54c75ba9503a3e4bded34da7ed2d87b2a6b3e6cb" "ref": "8925f8de20e8fcef2b8c639afce6ddec9d2b9efe"
}, },
"sqlalchemy": { "sqlalchemy": {
"hashes": [ "hashes": [