Merge branch 'master' into develop

2017-09-22 08:42:07 +02:00
parent 41e01184aa 79b873e40e
commit 18337f610d
418 changed files with 24139 additions and 3267 deletions
@@ -28,7 +28,6 @@ func init() {
 	bus.AddHandler("sql", SearchUsers)
 	bus.AddHandler("sql", GetUserOrgList)
 	bus.AddHandler("sql", DeleteUser)
-	bus.AddHandler("sql", SetUsingOrg)
 	bus.AddHandler("sql", UpdateUserPermissions)
 	bus.AddHandler("sql", SetUserHelpFlag)
 }