Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Felix Niklas 2015-10-28 11:33:33 +01:00
commit 46805b7469

View file

@ -178,6 +178,7 @@ class Index extends App.Controller
navupdate: '#users'
genericObject: 'User'
container: @el.closest('.content')
callback: @recent
)
App.Config.set( 'User', { prio: 1000, name: 'Users', parent: '#manage', target: '#manage/users', controller: Index, role: ['Admin'] }, 'NavBarAdmin' )