Merge branch 'develop' into feature/vm_pricing
This commit is contained in:
commit
bf0e152789
114 changed files with 11106 additions and 185 deletions
|
|
@ -6,6 +6,7 @@ from .views import DjangoHostingView, RailsHostingView, PaymentVMView, \
|
|||
VirtualMachineDetailListView
|
||||
|
||||
urlpatterns = [
|
||||
# url(r'pricing/?$', VMPricingView.as_view(), name='pricing'),
|
||||
url(r'index/?$', IndexView.as_view(), name='index'),
|
||||
url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),
|
||||
url(r'nodejs/?$', NodeJSHostingView.as_view(), name='nodejshosting'),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue