diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-03 18:47:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-03 18:47:07 +0800 |
| commit | e5532154a50114d5ffb1ffd850b746cab00cb899 (patch) | |
| tree | 0042cc997ccf4166b9b52464339d52d37d7a8ad6 /VERSION | |
| parent | 9666db2a442887ccf8ec2d81f5e2fedc1a3a3d3e (diff) | |
| parent | f75becc264f8bde0f58391fc226243d03e78aa7b (diff) | |
| download | go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.gz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.bz2 go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.lz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.xz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.zst go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.zip | |
Merge branch 'release/1.3.0'
Conflicts:
VERSION
cmd/geth/main.go
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.2.1 +1.3.1 |