updated changelog

mattmakai · mattmakai · commit 2c56eb6473f4 · 2014-07-24T10:49:50.000+02:00
diff --git a/change-log.html b/change-log.html
@@ -46,7 +46,8 @@ <h1>Change Log</h1>
 <h2>2014</h2>
 <h3>July</h3>
 <ul>
-<li>Made source control page text clearer.</li>
+<li>Rewrote parts of source control and CSS pages for clarity.</li>
+<li>Merged typo fixes PR #32.</li>
 <li>Added my Full Stack Python video from the EuroPython 2014 conference.</li>
 <li>Updated map with further details.</li>
 <li>Added a map to the front page. May move that elsewhere later though based
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -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-24T10:48:29Z</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-24T10:49:45Z</updated></feed>
diff --git a/source/content/pages/10-misc/1005-change-log.markdown b/source/content/pages/10-misc/1005-change-log.markdown
@@ -24,7 +24,8 @@ the
 
 ## 2014
 ### July
-* Made source control page text clearer.
+* Rewrote parts of source control and CSS pages for clarity.
+* Merged typo fixes PR #32.
 * Added my Full Stack Python video from the EuroPython 2014 conference.
 * Updated map with further details.
 * Added a map to the front page. May move that elsewhere later though based

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<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-24T10:48:29Z</updated></feed>`
	`2`	`+<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-24T10:49:45Z</updated></feed>`