Skip to content

Commit

Permalink
Merge pull request #4384 from benjaoming/mit-license
Browse files Browse the repository at this point in the history
Fix #4382 -- we are MIT licensed
  • Loading branch information
jamalex committed Sep 7, 2015
2 parents 7b5c320 + 2da4cac commit 5d6ddd7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def install_distributions(distributions):
author_email="[email protected]",
url="https://www.learningequality.org",
description=DIST_DESCRIPTION,
license="GPLv3",
license="MIT",
keywords=("khan academy", "offline", "education", "OER"),
scripts=['bin/kalite'],
packages=find_packages(exclude=["python-packages"]),
Expand All @@ -361,7 +361,7 @@ def install_distributions(distributions):
install_requires=DIST_REQUIREMENTS,
classifiers=[
'Development Status :: 4 - Beta',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'License :: OSI Approved :: MIT License',
'Environment :: Web Environment',
'Framework :: Django',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 5d6ddd7

Please sign in to comment.