diff options
| author | Tom Christie | 2014-12-03 23:24:32 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-03 23:24:32 +0000 |
| commit | 5e6052811716a494e995a84c497579867ee6acaa (patch) | |
| tree | ee3b2a12ee552daac3a49862ae2fc6e934975b34 /README.md | |
| parent | cd4d8660211e7af3b06986b68a9281be0b8ffacf (diff) | |
| parent | 3d6620c72a9cbaedecc37cc76e591a79409de305 (diff) | |
| download | django-rest-framework-5e6052811716a494e995a84c497579867ee6acaa.tar.bz2 | |
Merge branch 'jpadilla-yaml' into version-3.1
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -214,6 +214,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [docs]: http://www.django-rest-framework.org/ [urlobject]: https://github.com/zacharyvoase/urlobject [markdown]: http://pypi.python.org/pypi/Markdown/ -[pyyaml]: http://pypi.python.org/pypi/PyYAML [django-filter]: http://pypi.python.org/pypi/django-filter [security-mail]: mailto:rest-framework-security@googlegroups.com |