diff options
| author | Chris McDonough <chrism@plope.com> | 2014-06-05 12:37:40 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-06-05 12:37:40 -0400 |
| commit | cd1d8d278105137a2ca46e39d0a6dea43075eedd (patch) | |
| tree | 4383042869a86be4c97e3ec3b39759d0c29ee744 | |
| parent | 352e9102157d72f9ac8a2483339181c08920a294 (diff) | |
| parent | be04fa8949b710b613034bfb7d224ab8b41c754a (diff) | |
| download | pyramid-cd1d8d278105137a2ca46e39d0a6dea43075eedd.tar.gz pyramid-cd1d8d278105137a2ca46e39d0a6dea43075eedd.tar.bz2 pyramid-cd1d8d278105137a2ca46e39d0a6dea43075eedd.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
3 files changed, 3 insertions, 0 deletions
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl index 73d0976b9..3f1d23d47 100644 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl @@ -46,6 +46,7 @@ <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li> <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li> <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li> + </ul> </div> </div> <div class="row"> diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl index 738a16817..87fae3817 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl @@ -46,6 +46,7 @@ <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li> <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li> <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li> + </ul> </div> </div> <div class="row"> diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl index 855944899..e109ab829 100644 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl @@ -46,6 +46,7 @@ <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li> <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li> <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li> + </ul> </div> </div> <div class="row"> |