]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
projects / thirdparty / sqlalchemy / sqlalchemy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e602a73 c85fa9f)
Merge branch 'master' into xdist_poc
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 26 Jul 2014 23:04:07 +0000 (19:04 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 26 Jul 2014 23:04:07 +0000 (19:04 -0400)
Conflicts:
lib/sqlalchemy/engine/url.py

1  2 
lib/sqlalchemy/testing/plugin/plugin_base.py patch | diff1 | diff2 | blob | history

Mirror of https://github.com/sqlalchemy/sqlalchemy.git