diff options
| author | Michael Merickel <michael@merickel.org> | 2014-05-07 01:47:05 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-05-07 01:47:05 -0500 |
| commit | 8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6 (patch) | |
| tree | a1ffe16937711d514433bce8e2112aea0a8321d5 | |
| parent | 8f22d846af8faba71a2e20e0fb9da52ec4ec5a5e (diff) | |
| parent | 93bc46364b13723194dba62fe78dee8b358d6401 (diff) | |
| download | pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.gz pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.bz2 pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.zip | |
Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | docs/narr/MyProject/myproject/templates/mytemplate.pt | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl | 2 |
6 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index de0a4324b..0c461e550 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -35,6 +35,9 @@ Scaffolds templates to have links to correctly versioned documentation and reflect which pyramid was used to generate the scaffold. +- Removed non-ascii copyright symbol from templates, as this was + causing the scaffolds to fail for project generation. + 1.5 (2014-04-08) ================ diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index d1ac72df5..c77d3e92c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -230,3 +230,5 @@ Contributors - Antti Haapala, 2013/11/15 - Amit Mane, 2014/01/23 + +- Fenton Travers, 2014/05/06 diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index d1af4f42c..e6b00a145 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -50,7 +50,7 @@ </div> <div class="row"> <div class="copyright"> - Copyright © Pylons Project + Copyright © Pylons Project </div> </div> </div> diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl index 976011ecb..73d0976b9 100644 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl @@ -50,7 +50,7 @@ </div> <div class="row"> <div class="copyright"> - Copyright © Pylons Project + Copyright © Pylons Project </div> </div> </div> diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl index 3c27906a0..738a16817 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl @@ -50,7 +50,7 @@ </div> <div class="row"> <div class="copyright"> - Copyright © Pylons Project + Copyright © Pylons Project </div> </div> </div> diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl index 56efda8b4..855944899 100644 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl @@ -50,7 +50,7 @@ </div> <div class="row"> <div class="copyright"> - Copyright © Pylons Project + Copyright © Pylons Project </div> </div> </div> |