| 
							
							
								 Tom Christie | 4cdfb6adc2 | Add REST framework: Under the hood. video to the 3.0 announcement. | 2014-12-09 13:18:18 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fd02d8266b | Added 3.0 to release notes. | 2014-12-08 15:16:33 +00:00 |  | 
			
				
					| 
							
							
								 José Padilla | 8ba4e7bafe | Add misc note about localization | 2014-12-08 09:18:37 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | deec61e0d6 | Merge pull request #2173 from jpadilla/master Consolidate Django and test requirements | 2014-12-02 08:32:28 +00:00 |  | 
			
				
					| 
							
							
								 Tymur Maryokhin | 0a91999d6a | Merge branch 'master' of github.com:tomchristie/django-rest-framework | 2014-12-02 01:50:17 +01:00 |  | 
			
				
					| 
							
							
								 José Padilla | bc0c25df30 | Consolidate Django and test requirements | 2014-12-01 17:31:11 -04:00 |  | 
			
				
					| 
							
							
								 José Padilla | 080fa4f5f8 | Change allow_none to allow_null | 2014-12-01 11:26:50 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 1caa14dd14 | Minor 3.0 announcment tweaks | 2014-12-01 12:22:21 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 270c7acdd7 | Minor validtors tweak | 2014-12-01 11:59:04 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b9503cd603 | Support Django's core ValidationError for backwards compat. Refs #2145. | 2014-12-01 10:48:45 +00:00 |  | 
			
				
					| 
							
							
								 Tymur Maryokhin | e2ea98e8ab | Fixed typos | 2014-11-29 20:23:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | caf1de3b88 | Minor tweaks to contributing docs | 2014-11-28 16:06:44 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9ba29a88d6 | Finalizing 3.0 release notes | 2014-11-28 14:43:33 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 66b3daebbd | Docs. Sponsor call-out. | 2014-11-28 13:14:47 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 05a86e3d65 | Docs. Minor tweaks. | 2014-11-28 12:51:44 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d4b8e356b9 | Merge branch '3.0-docs' | 2014-11-28 09:57:02 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 34ca8cd2a5 | Moar docs. Amazing. | 2014-11-28 09:56:44 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c61c59f8b7 | Notes on removal of Field.validate() and Serializer.transform_<field_name> | 2014-11-27 17:01:46 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2fe6709769 | Fix sponsor images for mkdocs | 2014-11-27 11:00:57 +00:00 |  | 
			
				
					| 
							
							
								 José Padilla | 9b88c096e0 | Remove Third party packages section Information about Third party packages is already covered under the Third Party Resources topic | 2014-11-26 18:12:12 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 678f7b4c65 | Update notes on autocomplete | 2014-11-26 10:43:45 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f13c0ebe69 | Merge master | 2014-11-25 16:27:00 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c7701cd75a | Tweak | 2014-11-25 16:08:48 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d7f8047add | Merge branch 'mkdocs' of git://github.com/d0ugal/django-rest-framework into d0ugal-mkdocs | 2014-11-25 15:52:36 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 64d8e3dcb6 | Typo. Refs #2132. | 2014-11-25 13:50:35 +00:00 |  | 
			
				
					| 
							
							
								 José Padilla | 38fe2c9dad | Document writing third party packages Add the following sections:
- “About Third Party Packages”
- “How to create a Third Party Package”
- “Existing Third Party Packages”
Resolve #2043 | 2014-11-25 09:38:48 -04:00 |  | 
			
				
					| 
							
							
								 José Padilla | 200e0b17da | Clean up extra white space | 2014-11-25 12:44:11 +00:00 |  | 
			
				
					| 
							
							
								 Dougal Matthews | 2ddef2d326 | Drop simply from the mkdocs install lines It is still simple tho', honest ;) | 2014-11-25 12:43:02 +00:00 |  | 
			
				
					| 
							
							
								 Dougal Matthews | 84d9c4b46e | Change site_dir to html to match mkdocs.py | 2014-11-25 12:42:39 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3b40f8c1c1 | Drop 0.x release notes | 2014-11-25 12:15:48 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 83281254d1 | Hypenate 'un-coerced' | 2014-11-25 12:06:27 +00:00 |  | 
			
				
					| 
							
							
								 Marc | 83e556ba1e | Missing quotes on validate_score example | 2014-11-25 12:37:20 +01:00 |  | 
			
				
					| 
							
							
								 Tony Nguyen | c94d1e6d3e | Fix typo "serailizers" to  "serializers" | 2014-11-23 22:40:40 +07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 071c064d25 | Fill in TODOs for 3.0 beta release notes | 2014-11-20 14:22:53 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6a2023a362 | Note on 3.1 and 3.2 releases. | 2014-11-20 13:52:00 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | bc83dfece4 | Merge branch 'master' into 3.0-beta | 2014-11-19 14:04:31 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 51b7033e4a | Further notes in 3.0 announcement | 2014-11-19 14:03:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f269826a7d | Note on 3.0 beta | 2014-11-18 16:26:45 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5e74f02d61 | Note removal of 'save_object' and fail loudly if it exists | 2014-11-18 14:49:00 +00:00 |  | 
			
				
					| 
							
							
								 José Padilla | d08cfb0559 | Fix runtests examples Correctly rename runtests examples to work with current runtests.py file. | 2014-11-17 08:17:40 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ea98de9b88 | Model fields with .blank or .null now map to required=False. Closes #2017. Closes #2021. | 2014-11-13 19:28:57 +00:00 |  | 
			
				
					| 
							
							
								 Jochen Van de Velde | 440d61ab36 | Fix some typos and other errors | 2014-11-08 11:02:48 +01:00 |  | 
			
				
					| 
							
							
								 José Padilla | 058fea23d3 | Fix csrf-ajax link. Closes #2045 | 2014-11-07 23:55:42 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 93633c297c | Tweaks to release notes | 2014-11-07 20:44:12 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 59b30307e8 | Fixes to release notes | 2014-11-07 20:10:15 +00:00 |  | 
			
				
					| 
							
							
								 Sumana Harihareswara | 7352405697 | Updated book link in HATEOAS page Per http://www.crummy.com/2013/10/03/0 , the new book is *RESTful Web APIs* and the old book, *RESTful Web Services*, is obsolete. | 2014-11-04 17:18:13 -05:00 |  | 
			
				
					| 
							
							
								 Tom Davis | 3375fecc8b | Fix typo That's all. | 2014-11-03 15:05:45 -05:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 1925d465ae | Call out 'get_value' and 'get_attribute' | 2014-11-03 16:42:00 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5d7b835608 | Tweaks to validation notes | 2014-11-03 16:17:53 +00:00 |  | 
			
				
					| 
							
							
								 Rocky Meza | 9ce130d1b5 | Fixed some typos in 3.0 release notes | 2014-11-03 06:56:42 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d27b8cc09b | PUT as create docs, and move mixin out to external gist | 2014-11-03 12:00:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 37845968cd | Merge master | 2014-11-03 11:39:54 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 96bb77dc35 | Version 2.4.4 | 2014-11-03 11:20:18 +00:00 |  | 
			
				
					| 
							
							
								 Andy Baker | 964b3401fb | typo fix | 2014-11-01 10:25:59 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 159c3de9fc | Merge master | 2014-10-31 15:19:15 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c5d1be8eac | .validate() can raise field errors or non-field errors | 2014-10-22 10:32:32 +01:00 |  | 
			
				
					| 
							
							
								 José Padilla | 11edd01c34 | Add docs regarding linking third party packages | 2014-10-17 08:58:31 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 05cbec9dd7 | Use serializers.ValidationError | 2014-10-17 13:23:14 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d0f610be44 | Update release notes | 2014-10-16 20:47:57 +01:00 |  | 
			
				
					| 
							
							
								 konradhalas | 5e89994a10 | Add to main 3rd party resources list. | 2014-10-16 15:16:13 +02:00 |  | 
			
				
					| 
							
							
								 wolfe | f8f101268e | Update 3.0-announcement.md Swap order of custom field API changes so the two "and" clauses are in the same order. | 2014-10-14 18:58:25 -03:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d8a8987ab1 | Tweaks | 2014-10-10 14:32:02 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d9a199ca0d | exceptions.ValidationFailed, not Django's ValidationError | 2014-10-10 14:16:09 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | babdc78e61 | Typo | 2014-10-09 11:39:01 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4c015df28c | Tweaks | 2014-10-08 16:43:33 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 14ae52a24e | More gradual deprecation | 2014-10-08 16:09:37 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0cbb57b40f | Tweak pre/post save hooks. Return instance in .update(). | 2014-10-08 12:17:30 +01:00 |  | 
			
				
					| 
							
							
								 Kevin London | 0803716ed0 | Update links in 2.4-announcement.md The links to Django Rest Framework pages were 404ing because the URLs include a slash. | 2014-10-04 17:34:27 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3a3e2bf57d | Serializer.save() takes keyword arguments, not 'extras' argument | 2014-10-03 13:42:06 +01:00 |  | 
			
				
					| 
							
							
								 Craig de Stigter | 857a8486b1 | More spelling tweaks | 2014-10-03 09:00:33 +13:00 |  | 
			
				
					| 
							
							
								 Craig de Stigter | dfab9af294 | Minor: fix spelling and grammar, mostly in 3.0 announcement | 2014-10-03 08:41:18 +13:00 |  | 
			
				
					| 
							
							
								 Omer Katz | 770d63fb04 | Fixed documentation typo. | 2014-10-01 13:12:33 +03:00 |  | 
			
				
					| 
							
							
								 Tom Christie | da4900a353 | Update 3.0-announcement.md | 2014-09-30 11:10:13 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 83a5ea8db2 | Update release notes | 2014-09-29 21:17:13 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 657d1de032 | Latest release notes | 2014-09-29 14:12:09 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4798df52df | Update release notes | 2014-09-29 12:57:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ce04d59a53 | Update release notes | 2014-09-26 17:07:47 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ac71d9aaae | Merge master | 2014-09-26 14:39:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ee79b45397 | Prepend some pre-release notes | 2014-09-26 13:19:32 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 24f7db2fc1 | Release notes | 2014-09-26 13:12:10 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0eb6a4de8a | Release notes | 2014-09-26 13:10:58 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8b8623c5f8 | Allow many, partial and context in BaseSerializer | 2014-09-26 12:48:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fde934d33c | Release notes | 2014-09-26 12:21:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 90311357ad | Release notes | 2014-09-26 12:18:27 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e8af73d144 | Release notes | 2014-09-26 12:17:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 43e80c74b2 | Release notes | 2014-09-26 11:56:29 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2859eaf524 | request.data attribute | 2014-09-26 10:46:52 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 630d472055 | Merge branch 'master' into version-3.0 | 2014-09-24 14:10:00 +01:00 |  | 
			
				
					| 
							
							
								 Collin Anderson | da385c9c1f | remove patterns and strings from urls #1898 | 2014-09-23 17:10:02 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c0150e619c | Add BaseSerializer heading | 2014-09-19 14:59:59 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8495cd898a | Drop 'No major point releases are currently planned.', cos they are. | 2014-09-19 14:31:28 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 20424251a3 | Version 2.4.3 | 2014-09-19 14:26:28 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 88008c0a68 | Merge branch 'master' into version-3.0 | 2014-09-19 14:05:50 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6d73b5969a | Initial release notes | 2014-09-19 14:02:17 +01:00 |  | 
			
				
					| 
							
							
								 S. Andrew Sheppard | 3725a1e77d | add wq.db router and django-rest-pandas renderers | 2014-09-15 14:46:09 -05:00 |  | 
			
				
					| 
							
							
								 José Padilla | 915dfb9b3d | Update third-party-resources.md | 2014-09-14 10:19:54 -04:00 |  | 
			
				
					| 
							
							
								 José Padilla | 4871dbdc73 | Add invitation to add new content | 2014-09-13 16:20:37 -04:00 |  | 
			
				
					| 
							
							
								 José Padilla | 96c21b81f5 | Add Third Party Resources Topic section | 2014-09-13 13:53:40 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f08afe162c | Version 2.4.2 | 2014-09-03 16:35:17 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 55e779c856 | Version 2.4.1 | 2014-09-01 09:07:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5490fc2700 | Fix links in 2.4 release | 2014-08-29 13:29:51 +01:00 |  | 
			
				
					| 
							
							
								 Jamie Matthews | baceb528cb | Fix typos in 2.4 release notes | 2014-08-29 11:11:18 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 572107281f | Typo in 2.4 announcement name | 2014-08-29 10:15:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2a61ed8bac | 2.4 Release notes | 2014-08-29 10:10:17 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8f4ae06b3b | Merge pull request #1784 from tomchristie/remove-model-attribute Deprecate `.model` attribute on views | 2014-08-29 10:03:07 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | bb1604674f | Minor docs update | 2014-08-29 09:21:10 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e7e3d29de4 | Sponsor fix | 2014-08-28 17:35:45 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 73bd408f78 | Latest sponsor update | 2014-08-28 17:01:58 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8b2052172c | Add .model deprecation to release notes | 2014-08-21 12:25:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 21a0a826bb | Add Retry-After to release notes. Refs #1508. | 2014-08-20 17:34:51 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6953a5ecec | Typo | 2014-08-20 17:16:47 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 59b47eac14 | Fix cache_throttle typo | 2014-08-20 12:32:24 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6ffc97c808 | Merge pull request #1770 from tomchristie/2.4.0 2.4.0 Release. | 2014-08-20 12:06:29 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f7b3e1e62b | Latest sponsor update | 2014-08-20 11:09:04 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 874d2be83c | Release notes | 2014-08-20 00:19:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0c65e028b6 | Release notes | 2014-08-19 23:25:12 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 63d02dbea8 | Drop six from compat. 1.4.2 is now the lowest supported version. | 2014-08-19 17:06:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 00c0dfc66f | Documentation on runtests.py | 2014-08-19 16:29:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e385a7b8eb | Merge master | 2014-08-19 10:11:10 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c092b4df78 | Merge pull request #1641 from javins/login-title Refactor login template to extend base. | 2014-08-18 20:28:34 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2aad8e4b35 | Merge pull request #1654 from carltongibson/1559-take-2 Allow use of native migrations in 1.7 — Take 2 | 2014-08-18 18:54:43 +01:00 |  | 
			
				
					| 
							
							
								 Carlton Gibson | ae2ab496c2 | Updated docs for South v1.0 | 2014-08-18 13:48:46 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 38a0e3e627 | Sponsor update | 2014-08-16 14:02:44 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 172b9c74f9 | Latest sponsor update | 2014-08-15 17:48:43 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 967798e832 | Added compile to the sponsors | 2014-08-15 17:39:51 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4c60639595 | Added Holvi | 2014-08-15 16:19:13 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e624871a68 | Latest backer update | 2014-08-15 15:46:26 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a5561954d7 | Latest sponsor updates | 2014-08-15 15:36:49 +01:00 |  | 
			
				
					| 
							
							
								 catherinedodge | bfd0b261db | Fixed small typo | 2014-08-14 13:39:21 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 63d5634c66 | Minor sponsor correction | 2014-08-14 16:59:40 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | bdb884aceb | Latest sponsor update | 2014-08-14 16:57:21 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c52075f392 | Latest sponsor update | 2014-08-13 14:02:09 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5d674927b8 | Minor docs style change | 2014-08-12 14:59:17 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c716f35825 | Added Cantemo | 2014-08-12 14:57:27 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 7551db23ca | Added Rob Spectre | 2014-08-12 13:47:34 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f46b55b75f | Added OpenEye as a silver sponsor | 2014-08-12 13:44:00 +01:00 |  | 
			
				
					| 
							
							
								 Kevin London | bc03d2b553 | Updated links to Bootstrap components The previous links landed on the the main page and no longer directly linked to specific areas. | 2014-08-07 16:32:40 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 83597a4b0f | Latest sponsor update | 2014-08-05 15:31:39 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 322476c386 | Latest sponsor update | 2014-08-04 09:20:27 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 7bc9954fdb | Update sponsorships | 2014-08-02 15:28:34 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d0fdcdfdad | Added pathwright | 2014-08-02 15:18:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3ac075a227 | Update Nephila sponsorship | 2014-08-02 15:08:14 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f58dde59c4 | Sponsor updated | 2014-08-02 15:05:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9af3dc0ba5 | Added ProReNata AB | 2014-08-01 13:54:26 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5377bda942 | Fix LaterPay link | 2014-08-01 13:42:51 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f87aadb3ce | Latest sponsor updates | 2014-08-01 11:35:48 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6677374e9b | Kickstarter sponsors | 2014-07-31 22:33:45 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8044416523 | Add platinum sponsors | 2014-07-31 20:19:28 +01:00 |  | 
			
				
					| 
							
							
								 Xavier Ordoquy | 4876bec9f5 | Merge remote-tracking branch 'origin/master' into 2.4.0 Conflicts:
	rest_framework/fields.py | 2014-07-26 00:06:56 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ead0e60099 | Docs for kickstarter announcement | 2014-07-17 17:17:41 +01:00 |  |