Skip to content
Snippets Groups Projects
Commit 45005781eeb8 authored by INADA Naoki's avatar INADA Naoki
Browse files

Merge remote-tracking branch 'pymysql/master' into tornado

Conflicts:
	README.rst
	example.py
	pymysql/tests/__init__.py
	pymysql/tests/test_issues.py
	runtests.py
	tornado_mysql/connections.py
	tornado_mysql/cursors.py
	tornado_mysql/tests/base.py
	tornado_mysql/tests/test_DictCursor.py
	tornado_mysql/tests/test_basic.py
	tox.ini
Branches
No related tags found
No related merge requests found
Showing
with 23403 additions and 219 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment