<feed xmlns='http://www.w3.org/2005/Atom'>
<title>django-rest-framework/docs/api-guide, branch model-serializer-api</title>
<subtitle>Web APIs for Django.</subtitle>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/'/>
<entry>
<title>Final bits of docs for ModelSerializer fields API</title>
<updated>2014-12-19T21:32:43+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-19T21:32:43+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=2a1485e00943b8280245d19e1e1f8514b1ef18ea'/>
<id>2a1485e00943b8280245d19e1e1f8514b1ef18ea</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Stub out the documentation</title>
<updated>2014-12-19T16:58:35+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-19T16:58:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=48d15f6ff8a13aafd5b4977c8d1b4b7fe70b4f6a'/>
<id>48d15f6ff8a13aafd5b4977c8d1b4b7fe70b4f6a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into version-3.1</title>
<updated>2014-12-19T11:53:05+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-19T11:53:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=435aef77384759d5a29129cdb0cbe47b3de6df93'/>
<id>435aef77384759d5a29129cdb0cbe47b3de6df93</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add OPTIONS/metadata to docs index</title>
<updated>2014-12-18T15:42:27+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-18T15:42:27+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=7105c1308e08a756fcb4131168e3187b0bc1ddee'/>
<id>7105c1308e08a756fcb4131168e3187b0bc1ddee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into version-3.1</title>
<updated>2014-12-18T11:21:25+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-18T11:21:25+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=c8d88c8c8a594e3b66547a34462db4766292ea9e'/>
<id>c8d88c8c8a594e3b66547a34462db4766292ea9e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Docs/tutorial import fixes. Refs #2296</title>
<updated>2014-12-17T16:28:11+00:00</updated>
<author>
<name>Tymur Maryokhin</name>
</author>
<published>2014-12-17T16:28:11+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=eeb6e340644eba70b2fd41100db34b159ae6f091'/>
<id>eeb6e340644eba70b2fd41100db34b159ae6f091</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://github.com/tomchristie/django-rest-framework</title>
<updated>2014-12-17T16:19:13+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-17T16:19:13+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=265ed9377e457ec6b757ff07e0720b0ebefbb89d'/>
<id>265ed9377e457ec6b757ff07e0720b0ebefbb89d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Expand permissions docs. Closes #2223.</title>
<updated>2014-12-17T16:19:02+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-17T16:19:02+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=c9a2ce07037475359712104a8a68624e99bdfeb1'/>
<id>c9a2ce07037475359712104a8a68624e99bdfeb1</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #2294 from tomchristie/fix-empty-html-values-with-default</title>
<updated>2014-12-17T15:24:01+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-17T15:24:01+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=ad6533e554663a4c6c40fb02c7d7341fb5afe47f'/>
<id>ad6533e554663a4c6c40fb02c7d7341fb5afe47f</id>
<content type='text'>
Fix empty HTML values when a default is provided.</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix empty HTML values when a default is provided.</pre>
</div>
</content>
</entry>
<entry>
<title>Fix empty HTML values when a default is provided.</title>
<updated>2014-12-17T15:13:48+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-12-17T15:13:48+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=3fff5cb6e0960b7ff8abd9f13a075f1f057de0a7'/>
<id>3fff5cb6e0960b7ff8abd9f13a075f1f057de0a7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
