ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3168 from normanjaeckel/Release-2.1

Browse Source 
Release 2.1
This commit is contained in:
Emanuel Schütze 2017-03-29 17:29:21 +02:00 committed by GitHub
commit d758159bff
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -25,3 +25,4 @@ Authors of OpenSlides in chronological order of first contribution:
Finn Stutzenstein <finn.stutzenstein@hotmail.de> Finn Stutzenstein <finn.stutzenstein@hotmail.de>
Thomas Junk <lilith2k3@archlinux.us> Thomas Junk <lilith2k3@archlinux.us>
Meinert Leinigen <openslides@leinigen.cc> Meinert Leinigen <openslides@leinigen.cc>
Andreas Engler <engel.a@web.de> (Russian translation)

6
CHANGELOG
View File

@ -4,7 +4,11 @@
https://openslides.org/ https://openslides.org/
Version 2.1 (unreleased) Version 2.1.1 (unreleased)
==========================
Version 2.1 (2017-03-29)
======================== ========================
[https://github.com/OpenSlides/OpenSlides/milestones/2.1] [https://github.com/OpenSlides/OpenSlides/milestones/2.1]

2
openslides/__init__.py
View File

@ -1,3 +1,3 @@
__author__ = 'OpenSlides Team <support@openslides.org>' __author__ = 'OpenSlides Team <support@openslides.org>'
__description__ = 'Presentation and assembly system' __description__ = 'Presentation and assembly system'
__version__ = '2.1b5-dev' __version__ = '2.1.1-dev'

7
setup.py
View File

@ -25,14 +25,15 @@ setup(
classifiers=[ classifiers=[
# http://pypi.python.org/pypi?%3Aaction=list_classifiers # http://pypi.python.org/pypi?%3Aaction=list_classifiers
# 'Development Status :: 3 - Alpha', # 'Development Status :: 3 - Alpha',
'Development Status :: 4 - Beta', # 'Development Status :: 4 - Beta',
# 'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment', 'Environment :: Web Environment',
'Framework :: Django', 'Framework :: Django',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', ], 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', ],
packages=find_packages(exclude=['tests', 'tests.*']), packages=find_packages(exclude=['tests', 'tests.*']),
include_package_data=True, include_package_data=True,
install_requires=install_requires, install_requires=install_requires,