Merge branch 'master' into doc_replace_vs_convert

Conflicts: docs/index.rst
leezqcst · Jun 28, 2016 · 6563b84 · 6563b84
2 parents f290c12 + 319f2d0
commit 6563b84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -38,7 +38,7 @@ Features
 --------
 
 - Fully implemented, drop-in replacement for datetime 
-- Supports Python 2.6, 2.7 and 3.3
+- Supports Python 2.6, 2.7, 3.3, 3.4 and 3.5
 - Time zone-aware & UTC by default
 - Provides super-simple creation options for many common input scenarios
 - Updated .replace method with support for relative offsets, including weeks

diff --git a/docs/index.rst b/docs/index.rst
@@ -26,7 +26,7 @@ Features
 --------
 
 - Fully implemented, drop-in replacement for datetime
-- Supports Python 2.6, 2.7 and 3.3+
+- Supports Python 2.6, 2.7, 3.3, 3.4 and 3.5
 - Timezone-aware & UTC by default
 - Provides super-simple creation options for many common input scenarios
 - Updated .replace method with support for relative offsets, including weeks