diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /release | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'release')
| -rwxr-xr-x | release/rtool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/rtool.py b/release/rtool.py index 04e1249d..4e43eaef 100755 --- a/release/rtool.py +++ b/release/rtool.py @@ -76,7 +76,7 @@ def get_snapshot_version(): return "{version}dev{tag_dist:04}-0x{commit}".format( version=get_version(), # this should already be the next version tag_dist=tag_dist, - commit=commit + commit=commit.decode() ) |