Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
cmurtaugh committed Jun 16, 2016
2 parents 60c67ca + 7a68fd2 commit 5efd857
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
13 changes: 12 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
License TBD; this app is really only useful for internal purposes.
Copyright 2016 The President and Fellows of Harvard College

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

setup(
name='django-auth-lti',
version='1.2.5',
version='1.2.6',
packages=['django_auth_lti'],
include_package_data=True,
license='TBD License', # example license
description='A simple Django app containing LTI auth middleware and backend.',
long_description=README,
url='http://icommons.harvard.edu/',
author='Colin Murtaugh',
author_email='colin_murtaugh@harvard.edu',
url='http://tlt.harvard.edu/',
author='Harvard University Teaching and Learning Technologies Program',
author_email='tlt-ops@g.harvard.edu',
classifiers=[
'Environment :: Web Environment',
'Framework :: Django',
Expand Down

0 comments on commit 5efd857

Please sign in to comment.