Skip to content

[AC-7355] Merge changes from upstream repo #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[AC-7355] Merge changes from upstream repo #62

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f52daf6
Fix Django 1.10 and 2.0 compatibility
mrs83 Mar 20, 2018
f581b91
Add Django >= 1.10 "annotation_select" support.
May 13, 2018
ac9140f
Update tablib to 0.12.1
May 13, 2018
5250802
Update testproject's Django to 1.8 for Python 3.5 support
May 13, 2018
f43dae8
Applied patch from https://github.com/joshourisman/django-tablib/pull/58
Aug 23, 2018
b6be45d
Merge branch 'master' of https://github.com/mscam/django-tablib into …
Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tablib to 0.12.1
  • Loading branch information
Massimo Scamarcia committed May 13, 2018
commit ac9140f84bf42b87a6f0cf324fc85ed69364fde5
2 changes: 1 addition & 1 deletion testproject/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django==1.6
tablib==0.9.11
tablib==0.12.1