projects
/
cascardo
/
eventmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix conflict.
[cascardo/eventmanager.git]
/
urls.py
diff --git
a/urls.py
b/urls.py
index
cf93987
..
1ebcff7
100644
(file)
--- a/
urls.py
+++ b/
urls.py
@@
-28,7
+28,12
@@
urlpatterns = patterns('',
(r'^admin/', include('django.contrib.admin.urls')),
(r'^logout/', 'django.contrib.auth.views.logout',
{'next_page': '/'}),
(r'^admin/', include('django.contrib.admin.urls')),
(r'^logout/', 'django.contrib.auth.views.logout',
{'next_page': '/'}),
+
(r'^inscricao/', views.inscricao),
(r'^inscricao/', views.inscricao),
+ (r'^inscricao_individual/', views.inscricao_individual),
+ (r'^inscricao_caravana/', views.inscricao_caravana),
+ (r'^boleto/', views.inscricao_boleto),
+
(r'^submeter_trabalho/', views.submeter_trabalho),
(r'^cadastro_palestrante/', views.cadastro_palestrante),
(r'^meus_trabalhos/', views.meus_trabalhos),
(r'^submeter_trabalho/', views.submeter_trabalho),
(r'^cadastro_palestrante/', views.cadastro_palestrante),
(r'^meus_trabalhos/', views.meus_trabalhos),