Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kdesimone/popeye
Browse files Browse the repository at this point in the history
  • Loading branch information
kdesimone committed Sep 21, 2017
2 parents 120db2c + 9ba94a4 commit 21d1b71
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Unless otherwise specified by LICENSE.txt files in individual
directories, or within individual files or functions, all code is:

Copyright (c) 2013-2016, popeye developers
Copyright (c) 2013-2017, popeye developers
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions popeye/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"

_version_major = 0
_version_minor = 4
_version_micro = 1
_version_minor = 5
_version_micro = 0
# _version_extra = '.dev'
_version_extra = ''

Expand Down

0 comments on commit 21d1b71

Please sign in to comment.