]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge "Guard against KeyError in session.merge after check for identity" into rel_1_1
authormike bayer <mike_mp@zzzcomputing.com>
Tue, 5 Sep 2017 13:46:05 +0000 (09:46 -0400)
committerGerrit Code Review <gerrit@awstats.zzzcomputing.com>
Tue, 5 Sep 2017 13:46:05 +0000 (09:46 -0400)

Trivial merge