Merge branch 'master' into aureplop/kfet_open

This commit is contained in:
Aurélien Delobelle 2017-06-12 15:18:42 +02:00
commit ec59bc2edc
100 changed files with 3401 additions and 2508 deletions

View file

@ -193,7 +193,7 @@ urlpatterns = [
permission_required('kfet.change_settings')
(views.SettingsList.as_view()),
name='kfet.settings'),
url(r'^settings/(?P<pk>\d+)/edit$',
url(r'^settings/edit$',
permission_required('kfet.change_settings')
(views.SettingsUpdate.as_view()),
name='kfet.settings.update'),