Merge branch 'develop' into feature/vm_pricing

This commit is contained in:
Levi 2016-05-04 22:07:30 -05:00
commit bf0e152789
114 changed files with 11106 additions and 185 deletions

View file

@ -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'),