summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-05 19:03:23 -0400
committerChris McDonough <chrism@plope.com>2010-11-05 19:03:23 -0400
commit7e96fef8bf4df69b2547712c64d639e90ccbbab0 (patch)
tree7167ff66cddf111693bc4f3254bd29ce6ad19771
parent159cd09c56e5bb5bccd1daaee4040ea9037c9478 (diff)
parent90d6206928b6fcd0efdd289efa58ebaa53f7ae8b (diff)
downloadpyramid-7e96fef8bf4df69b2547712c64d639e90ccbbab0.tar.gz
pyramid-7e96fef8bf4df69b2547712c64d639e90ccbbab0.tar.bz2
pyramid-7e96fef8bf4df69b2547712c64d639e90ccbbab0.zip
Merge branch 'master' of https://github.com/koansys/pyramid into koansys-master
-rw-r--r--README.rst (renamed from README.txt)0
-rw-r--r--setup.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/README.txt b/README.rst
index 26859f999..26859f999 100644
--- a/README.txt
+++ b/README.rst
diff --git a/setup.py b/setup.py
index f9dae7298..b220d2914 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__))
try:
- README = open(os.path.join(here, 'README.txt')).read()
+ README = open(os.path.join(here, 'README.rst')).read()
CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
except IOError:
README = CHANGES = ''