amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop

Browse source 
Conflicts:
	dynamicweb/urls.py
This commit is contained in:
rascencio 2016-04-22 10:04:00 +02:00
commit f4fb538b9e
29 changed files with 990 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dynamicweb/urls.py
View file

@ -5,7 +5,11 @@ from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
from django.conf import settings
<<<<<<< HEAD
from hosting.views import railshosting, nodejshosting, djangohosting
=======
from hosting.views import RailsHostingView
>>>>>>> remotes/origin/feature/vm_pricing
from membership import urls as membership_urls
urlpatterns = [
@ -13,6 +17,7 @@ urlpatterns = [
url(r'^railshosting/', railshosting, name="rails.hosting"),
url(r'^nodehosting/', nodejshosting, name="node.hosting"),
url(r'^djangohosting/', djangohosting, name="django.hosting"),
url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),