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

Open

kaymation wants to merge 6 commits into

joshourisman:masterfrom

masschallenge:AC-7355

Commits on Mar 20, 2018

Fix Django 1.10 and 2.0 compatibility
mrs83
committed
f52daf6

Commits on May 13, 2018

Add Django >= 1.10 "annotation_select" support.
Massimo Scamarcia
committed
f581b91
Update tablib to 0.12.1
Massimo Scamarcia
committed
ac9140f
Update testproject's Django to 1.8 for Python 3.5 support
Massimo Scamarcia
committed
5250802

Commits on Aug 23, 2018

Applied patch from https://github.com/joshourisman/django-tablib/pull/58
Paul Bissex
committed
f43dae8

Commits on Jan 16, 2020

Merge branch 'master' of https://github.com/mscam/django-tablib into AC-7355
Kevin M Quigley
committed
b6be45d