Merge branch 'dev' into 'master'

Dev

See merge request !211
master
Andrey 8 years ago
commit 6484330fff
  1. 2
      finance/urls.py

@ -2,9 +2,9 @@ from django.conf.urls import url
from finance import views
urlpatterns = [
url(r'bills/([0-9]{1,99})/$', views.BillDetailView.as_view()),
url(r'payment/([0-9]{1,99})/$', views.YandexPay.as_view()),
url(r'bills/$', views.BillListView.as_view()),
url(r'bills/([0-9]{1,99})/$', views.BillDetailView.as_view()),
url(r'bills_find/$', views.FindBillView.as_view()),
url(r'yandex/fail/$', views.YandexFailView.as_view()),
url(r'invoices/$', views.get_invoices),

Loading…
Cancel
Save