diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-04-13 18:44:05 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-04-13 18:44:05 +0200 |
| commit | f1e13526df6d369faa2994e22e20f493958d7ee6 (patch) | |
| tree | 7badc275b0eef9b5c0a47fd38c74e8be0410c90a /talerbank/app/urls.py | |
| parent | 911461080a1f2eb8cd57d2102eeb44030cd6f13c (diff) | |
| parent | 176459ec20d1c9ad771fa9caeba06e6133b8ead6 (diff) | |
| download | bank-f1e13526df6d369faa2994e22e20f493958d7ee6.tar.gz bank-f1e13526df6d369faa2994e22e20f493958d7ee6.tar.bz2 bank-f1e13526df6d369faa2994e22e20f493958d7ee6.zip | |
Merge branch 'master' of ssh://taler.net/var/git/bank
Conflicts:
talerbank/app/apps.py
talerbank/app/config.py
talerbank/app/config.py.in
talerbank/app/funds_mgmt.py
talerbank/app/startup.py
talerbank/app/test.py
talerbank/app/user_mgmt.py
Diffstat (limited to 'talerbank/app/urls.py')
| -rw-r--r-- | talerbank/app/urls.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py index 7269ddb..73ad09c 100644 --- a/talerbank/app/urls.py +++ b/talerbank/app/urls.py @@ -20,16 +20,15 @@ from . import views urlpatterns = [ url(r'^$', views.home_page), url(r'^favicon\.ico$', views.ignore), - url(r'check-db-test', views.check_db_test_process), - url(r'register', views.register_process), - url(r'login', views.login_process), - url(r'logout', views.logout_process), - url(r'withdraw', views.withdraw_process), - url(r'public-accounts/details', views.view_public_accno_process), - url(r'public-accounts', views.public_accounts_process), - url(r'pin/question', views.pin_tan_question), - url(r'pin/verify', views.pin_tan_verify), - url(r'add/incoming', views.add_incoming_attempt), - url(r'profile', views.profile_process), - url(r'history', views.history_process) + url(r'^register$', views.register_process), + url(r'^login$', views.login_process), + url(r'^logout$', views.logout_process), + url(r'^withdraw$', views.withdraw_process), + url(r'^public-accounts/details$', views.view_public_accno_process), + url(r'^public-accounts$', views.public_accounts_process), + url(r'^pin/question$', views.pin_tan_question), + url(r'^pin/verify$', views.pin_tan_verify), + url(r'^add/incoming$', views.add_incoming_attempt), + url(r'^profile$', views.profile_process), + url(r'^history$', views.history_process) ] |