| 
							
							
								 Tom Christie | 52686420f4 | Merge branch 'bennbollay-patch-1' into 2.4.0 Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	rest_framework/compat.py
	tox.ini | 2013-12-23 09:48:59 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 31dd160256 | Typo | 2013-12-16 11:59:14 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6b6b255684 | Add note on pagination bugfix.  Closes #1293. | 2013-12-14 20:42:58 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f78b3187df | Added @philipforget for work on #1232. Thanks :) | 2013-12-13 22:01:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 54d3c6a725 | Updated release notes | 2013-12-13 21:59:47 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 87b99d1ac8 | Update release notes | 2013-12-13 20:17:26 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9c41c007af | Merge branch 'master' into 2.4.0 Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py | 2013-12-13 16:32:34 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c09ad1bedc | Remove incorrect apostrophe | 2013-12-10 08:53:38 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 40164fcc62 | Update release notes | 2013-12-10 08:49:54 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2c898bd901 | Update release notes | 2013-12-09 09:27:10 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c1be503308 | Add notes to contributing docs | 2013-12-09 08:46:18 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e6f6bb5c7e | Add notes to contributing docs | 2013-12-09 08:42:09 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 23369650e3 | Add notes to contributing docs | 2013-12-09 08:14:21 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e80b353085 | Add notes to contributing docs | 2013-12-09 08:10:51 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 910de38a9c | Version 2.3.10 | 2013-12-06 22:13:50 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 85d9eb0f7e | Update release-notes.md | 2013-12-06 21:47:26 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 51359e4612 | Added @chuckharmston for kickass bug squashing in #1272 | 2013-12-06 21:42:52 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6446b44f01 | Merge branch 'master' of https://github.com/tomchristie/django-rest-framework | 2013-12-04 14:59:28 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | de5b9e39dd | First pass on contribution guide | 2013-12-04 14:59:09 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 38d78b21c0 | Remove Content-Type header from empty responses. Fixes #1196 | 2013-12-03 16:55:11 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9f1918e41e | Added @ian-foote, for work on #1250.  Thanks! | 2013-12-03 16:06:57 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b92c911cf6 | Update release-notes.md | 2013-12-03 16:05:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fe4c7d4000 | Update release-notes.md | 2013-12-03 08:26:58 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 304b193efe | Update release-notes.md | 2013-11-19 15:58:34 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ca2bd616d9 | Remove a couple of .html suffixes in docs | 2013-11-19 11:01:27 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 1d1b2f765c | Version 2.3.9 | 2013-11-15 13:55:02 +00:00 |  | 
			
				
					| 
							
							
								 Alex | 72d72e4d3e | Add Alex Good to credits (Whoop!) | 2013-11-13 14:32:37 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 5e0538fcda | Added @robhudson for work on #1211.  Thanks! | 2013-11-02 09:15:35 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2ddf7869e3 | Added @yamila-moreno for work on #1199. Thanks! | 2013-10-24 15:29:40 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4d894fd39e | Added @alexanderlukanin13 for fix #1198.  Thanks! | 2013-10-24 13:50:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f92d8bd972 | Added @jbzdak, for the nice docs improvements in #1191. Thanks! | 2013-10-22 12:21:26 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fa87fac61b | Added @ross for work on #1187. Thanks! | 2013-10-22 10:21:06 +01:00 |  | 
			
				
					| 
							
							
								 Colin | daf927ef68 | add @tamakisquare for work on #1111 | 2013-10-17 12:28:58 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 545ee013e3 | Added @badale, for work on #1179.  Thanks! | 2013-10-17 09:40:06 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3833f1d55f | Added @hcliff for #1153. Thanks! | 2013-10-04 15:55:57 +01:00 |  | 
			
				
					| 
							
							
								 Jeff | 61dd9ce914 | Update release-notes.md Simple typo fix. | 2013-10-01 15:47:47 -06:00 |  | 
			
				
					| 
							
							
								 Krzysztof Jurewicz | 49847584a8 | Minor documentation fix. | 2013-09-29 12:49:38 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 21cd638659 | Merge master | 2013-09-25 09:44:26 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 57a51f790b | Added @mkai, for work on #1126.  Thanks! | 2013-09-24 09:21:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e8c6cd5622 | Update release notes. | 2013-09-13 19:43:19 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d75ecb3d69 | Added @mrmachine.  Thanks! For work on #1109. | 2013-09-13 19:40:58 +01:00 |  | 
			
				
					| 
							
							
								 Tai Lee | a9dbd46c94 | Refs #1109 -- Update docs. Integrate changes from feedback. | 2013-09-14 00:54:44 +10:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 895beb89c6 | Note on '.model' as default only, with 'serializer_class', and 'queryset' attributes prefered.  Closes #1100 | 2013-09-12 21:41:21 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 195790e60b | Version 2.3.8 | 2013-09-11 09:09:30 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e021472a16 | Added @bwreilly for awesome work on #1093.  Thanks!!! | 2013-09-10 21:07:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 101da45810 | Updated release notes | 2013-09-10 21:06:42 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f5c34926d6 | Update release-notes.md | 2013-09-09 20:41:54 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b47f1b0257 | Added @edmundwong for work on #1076.  Thanks! | 2013-09-05 20:25:45 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f8101114d1 | Update release notes | 2013-08-30 09:31:35 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9a5b2eefa9 | Merge master | 2013-08-30 09:28:33 +01:00 |  |