diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-11 18:20:35 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-11 18:20:35 -0400 |
| commit | 5ccda3f2d95d7fbf7713df7e4eab61059a6683cd (patch) | |
| tree | 6f75fe25a4e810df0f503c8e4cf3ffc1ba69022e /lib/sqlalchemy/sql/naming.py | |
| parent | cc58a605d6cded0594f7db1caa840b3c00b78e5a (diff) | |
| parent | b815e9483319b93f98bef11c7d47378441f78d21 (diff) | |
| download | sqlalchemy-5ccda3f2d95d7fbf7713df7e4eab61059a6683cd.tar.gz | |
Merge branch 'master' into ticket_3054
Conflicts:
examples/performance/short_selects.py
lib/sqlalchemy/orm/query.py
Diffstat (limited to 'lib/sqlalchemy/sql/naming.py')
| -rw-r--r-- | lib/sqlalchemy/sql/naming.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/naming.py b/lib/sqlalchemy/sql/naming.py index 6508ed620..bc13835ed 100644 --- a/lib/sqlalchemy/sql/naming.py +++ b/lib/sqlalchemy/sql/naming.py @@ -1,5 +1,5 @@ # sqlalchemy/naming.py -# Copyright (C) 2005-2014 the SQLAlchemy authors and contributors +# Copyright (C) 2005-2015 the SQLAlchemy authors and contributors # <see AUTHORS file> # # This module is part of SQLAlchemy and is released under |