Manual merge of ungleich/master into opennebula-integration
This commit is contained in:
parent
d10285e23d
commit
d537fcb118
227 changed files with 25686 additions and 482 deletions
|
|
@ -1,8 +1,10 @@
|
|||
from django.conf.urls import url
|
||||
|
||||
from .views import IndexView
|
||||
from .views import IndexView, BetaProgramView, LandingProgramView
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^/?$', IndexView.as_view(), name='index'),
|
||||
url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'),
|
||||
url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'),
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue