|
From: Oleg B. <no...@so...> - 2016-02-16 18:17:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 6cc76f06612f0adfc3858d515767a712a5465f2a (commit)
via 158a6ecc3fd37f8751b904db3776f646efe9cfdd (commit)
via 52da711ccfefe9714132086bb3b4bf1a691e9300 (commit)
via 8d282f7603f95b8ac8706f3ce216d000f4742f65 (commit)
via 7ba9175dd2203ce3e4665b11802c8bd963f5b46d (commit)
from 9238f42a2c13ffb41f044b33f4d4c6bfb1c05c5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/6cc76f06612f0adfc3858d515767a712a5465f2a
commit 6cc76f06612f0adfc3858d515767a712a5465f2a
Merge: 9238f42 158a6ec
Author: Oleg Broytman <ph...@ph...>
Date: Tue Feb 16 20:59:54 2016 +0300
Merge branch '2.2'
diff --cc setup.py
index b532d22,c8a1f47..4099b41
--- a/setup.py
+++ b/setup.py
@@@ -52,13 -52,13 +52,13 @@@ more abstract, and provides substantia
applications.
Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
-Python 2.6 or 2.7 is required.
+Python 2.6, 2.7 or 3.4+ is required.
For development see the projects at
- `SourceForge <http://sourceforge.net/projects/sqlobject/>`_
+ `SourceForge <https://sourceforge.net/projects/sqlobject/>`_
and `GitHub <https://github.com/sqlobject>`_.
-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=2.2
+.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
:target: https://travis-ci.org/sqlobject/sqlobject
""",
classifiers=[
-----------------------------------------------------------------------
Summary of changes:
docs/Authors.txt | 4 ++--
docs/DeveloperGuide.txt | 4 ++--
docs/FAQ.txt | 4 ++--
docs/Inheritance.txt | 4 ++--
docs/News.txt | 4 ++--
docs/News1.txt | 4 ++--
docs/News2.txt | 4 ++--
docs/News3.txt | 4 ++--
docs/News4.txt | 4 ++--
docs/SQLBuilder.txt | 4 ++--
docs/SQLObject.txt | 6 +++---
docs/SelectResults.txt | 4 ++--
docs/TODO.txt | 4 ++--
docs/Versioning.txt | 4 ++--
docs/Views.txt | 4 ++--
docs/community.txt | 8 ++++----
docs/download.txt | 6 +++---
docs/index.txt | 4 ++--
docs/links.txt | 6 +++---
docs/sqlobject-admin.txt | 4 ++--
setup.py | 2 +-
21 files changed, 46 insertions(+), 46 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
