diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
| commit | a63839708d6574567bcd518a822a9f10629ed80b (patch) | |
| tree | 02c28e0856b62c08fd4d3622ee68d145d8eee6eb /doc/conf.py | |
| parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
| parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) | |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
Diffstat (limited to 'doc/conf.py')
| -rw-r--r-- | doc/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py index 7e13eae..807dec6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -64,9 +64,9 @@ copyright = u'2014-2015, Mario Mulansky' # built documents. # # The short X.Y version. -version = '0.4' +version = '0.5' # The full version, including alpha/beta/rc tags. -release = '0.4.0' +release = '0.5.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |