[Koha-bugs] [Bug 31378] Add a generic OAuth2/OIDC client implementation

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31378

David Cook <dcook at prosentient.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #101 from David Cook <dcook at prosentient.com.au> ---
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
Auto-merging installer/data/mysql/mandatory/userpermissions.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/mandatory/userpermissions.sql
error: could not apply b466baa415... Bug 31378: Add
manage_authentication_providers permission
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Could not apply b466baa415... Bug 31378: Add manage_authentication_providers
permission

-- 
You are receiving this mail because:
You are watching all bug changes.