Merge branch 'master' into master

This commit is contained in:
Jean Jordaan
2019-03-03 13:29:21 +07:00
committed by GitHub
304 changed files with 782 additions and 102041 deletions
+5 -5
View File
@@ -48,7 +48,7 @@ Tablib is released under terms of `The MIT License`_.
Tablib License
--------------
Copyright 2016 Kenneth Reitz
Copyright 2017 Kenneth Reitz
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -76,11 +76,11 @@ Pythons Supported
At this time, the following Python platforms are officially supported:
* cPython 2.5
* cPython 2.6
* cPython 2.7
* cPython 3.1
* cPython 3.2
* cPython 3.3
* cPython 3.4
* cPython 3.5
* cPython 3.6
* PyPy-c 1.4
* PyPy-c 1.5