summaryrefslogtreecommitdiff
path: root/docs/quick_tour/awesome/README.txt
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
commit1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch)
tree0db5dd6f25a9166c118c4a24d66f281f43b0aeba /docs/quick_tour/awesome/README.txt
parent30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff)
parentaa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff)
downloadpyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/quick_tour/awesome/README.txt')
-rw-r--r--docs/quick_tour/awesome/README.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/quick_tour/awesome/README.txt b/docs/quick_tour/awesome/README.txt
deleted file mode 100644
index f695286d9..000000000
--- a/docs/quick_tour/awesome/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-awesome README
-
-
-