Skip to content

Commit

Permalink
Release 3.2.0beta0 by merging branch 'stable' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathias Svensson committed Oct 2, 2016
2 parents b0ad5eb + fc097f3 commit 548e033
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Expand Up @@ -9,9 +9,10 @@ The table below shows which release corresponds to each branch, and what date th

| Version | Branch | Release Date |
| ---------------- | -------- | ---------------------- |
| [3.2.0](#320) | `dev` | Nov 12, 2016 (planned)
| [3.1.0](#310) | `beta` | Oct 1, 2016 (planned)
| [3.0.4](#304) | `stable` | Sept 19, 2016
| [3.3.0](#330) | `dev` | Dec 24, 2016 (planned)
| [3.2.0](#320) | `beta` | Nov 12, 2016 (planned)
| [3.1.0](#310) | `stable` | Oct 2, 2016
| [3.0.4](#304) | | Sept 19, 2016
| [3.0.3](#303) | | Sept 18, 2016
| [3.0.2](#302) | | Sept 6, 2016
| [3.0.1](#301) | | Aug 20, 2016
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -2,7 +2,7 @@
![pwntools logo](https://github.com/Gallopsled/pwntools/blob/stable/docs/source/logo.png?raw=true)

[![Docs](https://readthedocs.org/projects/pwntools/badge/?version=stable)](https://docs.pwntools.com/)
[![PyPI](https://img.shields.io/badge/pypi-v3.0.4-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
[![PyPI](https://img.shields.io/badge/pypi-v3.1.0-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
[![Travis](https://travis-ci.org/Gallopsled/pwntools.svg)](https://travis-ci.org/Gallopsled/pwntools)
[![Coveralls](https://img.shields.io/coveralls/Gallopsled/pwntools/dev.svg)](https://coveralls.io/github/Gallopsled/pwntools?branch=dev)
[![Twitter](https://img.shields.io/badge/twitter-pwntools-4099FF.svg?style=flat)](https://twitter.com/pwntools)
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/version.py
@@ -1 +1 @@
__version__ = '3.2.0dev'
__version__ = '3.2.0beta0'
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -83,7 +83,7 @@
setup(
name = 'pwntools',
packages = find_packages(),
version = '3.2.0dev',
version = '3.2.0beta0',
data_files = [('',
glob.glob('*.md') + glob.glob('*.txt')),
],
Expand Down

0 comments on commit 548e033

Please sign in to comment.