Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion django.html
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ <h2>Django project templates</h2>
</li>
<li>
<p><a href="https://github.com/pydanny/cookiecutter-django">Cookiecutter Django</a> is a
project template from Daniel Greenfield, for use with Audrey Roy's
project template from Daniel Greenfeld, for use with Audrey Roy's
<a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>. Heroku
deployment-ready.</p>
</li>
Expand Down
2 changes: 1 addition & 1 deletion feeds/all.atom.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T12:05:19Z</updated></feed>
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T13:56:03Z</updated></feed>
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ existing framework.
is Django 1.6+ ready.

* [Cookiecutter Django](https://github.com/pydanny/cookiecutter-django) is a
project template from Daniel Greenfield, for use with Audrey Roy's
project template from Daniel Greenfeld, for use with Audrey Roy's
[Cookiecutter](https://github.com/audreyr/cookiecutter). Heroku
deployment-ready.

Expand Down