Attempted manual merge to avoid conflicts
This commit is contained in:
		
					parent
					
						
							
								96272ffd44
							
						
					
				
			
			
				commit
				
					
						cd524350d8
					
				
			
		
					 7 changed files with 328 additions and 121 deletions
				
			
		|  | @ -1,6 +1,6 @@ | |||
| from django.conf.urls import url | ||||
| 
 | ||||
| from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView | ||||
| from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, OrderView | ||||
| 
 | ||||
| 
 | ||||
| urlpatterns = [ | ||||
|  | @ -8,5 +8,7 @@ urlpatterns = [ | |||
|     url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), | ||||
|     url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), | ||||
|     url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), | ||||
|     url(r'^/order/?$', OrderView.as_view(), name='order'), | ||||
|     url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'), | ||||
|     url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), | ||||
| ] | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue