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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgomezb
							
						 
					 | 
					
						
						
						
						
							
						
						
							6be62bc1d7
							
						
					 | 
					
						
						
							
							Update urlpatterns.py
						
						
						
						
						
						
						
						Allow numbers in format extension. 
						
					 | 
					
						2013-11-14 09:22:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e441f85109
							
						
					 | 
					
						
						
							
							Drop 1.3 support
						
						
						
						
						
					 | 
					
						2013-09-25 10:30:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b052c92ac3
							
						
					 | 
					
						
						
							
							Cleanup imports
						
						
						
						
						
						
						
						Mostly adding `from __future__ import unicode_literals` everywhere. 
						
					 | 
					
						2013-02-04 20:55:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							98bffa68e6
							
						
					 | 
					
						
						
							
							Don't do an inverted if test.
						
						
						
						
						
					 | 
					
						2013-01-21 17:42:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							771821af7d
							
						
					 | 
					
						
						
							
							Include kwargs in included URLs
						
						
						
						
						
					 | 
					
						2013-01-19 18:39:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							69083c3668
							
						
					 | 
					
						
						
							
							Drop print statement
						
						
						
						
						
					 | 
					
						2013-01-19 18:36:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c05faa52a
							
						
					 | 
					
						
						
							
							format_suffix_patterns now support include-style nested URL patterns. Fixes #593
						
						
						
						
						
					 | 
					
						2013-01-19 16:56:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							eefd5b05fb
							
						
					 | 
					
						
						
							
							Use compat import of urlpatterns
						
						
						
						
						
					 | 
					
						2012-12-27 20:20:01 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							44ff2e0add
							
						
					 | 
					
						
						
							
							fixed some typos
						
						
						
						
						
					 | 
					
						2012-11-14 19:36:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							efabd2bb1b
							
						
					 | 
					
						
						
							
							docs, docs, docs, docs, docs, docs, docs
						
						
						
						
						
					 | 
					
						2012-10-19 19:59:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							115e61be09
							
						
					 | 
					
						
						
							
							Added quickstart guide
						
						
						
						
						
					 | 
					
						2012-10-09 12:01:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e77090b21
							
						
					 | 
					
						
						
							
							Fix bug in format suffix patterns
						
						
						
						
						
					 | 
					
						2012-10-05 15:38:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							272fddc952
							
						
					 | 
					
						
						
							
							Fix bug in format suffix patterns
						
						
						
						
						
					 | 
					
						2012-10-05 15:37:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b691c4027
							
						
					 | 
					
						
						
							
							Change package name: djangorestframework -> rest_framework
						
						
						
						
						
					 | 
					
						2012-09-20 13:06:27 +01:00 | 
					
					
						
						
							
							
							
						
					 |