Устранены конфликты
This commit is contained in:
@@ -4,6 +4,10 @@ from django.contrib.auth.views import login, logout
|
||||
from django.contrib import admin
|
||||
admin.autodiscover()
|
||||
|
||||
js_info_dict = {
|
||||
'packages': ('django.conf',),
|
||||
}
|
||||
|
||||
urlpatterns = patterns('',
|
||||
# Examples:
|
||||
# url(r'^$', 'record.views.home', name='home'),
|
||||
@@ -18,4 +22,5 @@ urlpatterns = patterns('',
|
||||
url(r'^inplaceeditform/', include('inplaceeditform.urls')),
|
||||
url(r'^accounts/login/$', login),
|
||||
url(r'^accounts/logout/$', logout),
|
||||
url(r'^jsi18n$', 'django.views.i18n.javascript_catalog', js_info_dict),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user