libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Fixing conflicts. (#1258)

Browse source 
(cherry picked from commit 92cde60f0e505a3e621ec5a9180d52860d76b580)
This commit is contained in:
andymunro 2021-11-10 06:23:19 -05:00 committed by GitHub
parent 942c6bafb5
commit ca1620abf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server_installation/master-docinfo.xml
View file

@ -10,7 +10,7 @@
<orgname>Red Hat Customer Content Services</orgname> <orgname>Red Hat Customer Content Services</orgname>
</authorgroup> </authorgroup>
<legalnotice lang="en-US" version="5.0" xmlns="http://docbook.org/ns/docbook"> <legalnotice lang="en-US" version="5.0" xmlns="http://docbook.org/ns/docbook">
<para> Copyright <trademark class="copyright"></trademark> 2020 Red Hat, Inc. </para> <para> Copyright <trademark class="copyright"></trademark> 2021 Red Hat, Inc. </para>
<para>Licensed under the Apache License, Version 2.0 (the "License"); <para>Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at</para> You may obtain a copy of the License at</para>

2
topics/templates/document-attributes-community.adoc
View file

@ -132,8 +132,6 @@ endif::[]
:jdgserver_version_latest: 11.0.9 :jdgserver_version_latest: 11.0.9
:jdgserver_crossdcdocs_link: https://infinispan.org/docs/11.0.x/titles/xsite/xsite.html :jdgserver_crossdcdocs_link: https://infinispan.org/docs/11.0.x/titles/xsite/xsite.html
:jdgserver_version_latest: 11.0.8 :jdgserver_version_latest: 11.0.8
:jdgserver_crossdcdocs_link: https://access.redhat.com/documentation/en-us/red_hat_data_grid/7.3/html/red_hat_data_grid_user_guide/x_site_replication
:fuseVersion: JBoss Fuse 6.3.0 Rollup 12 :fuseVersion: JBoss Fuse 6.3.0 Rollup 12
:fuseHawtioEAPVersion: JBoss EAP 6.4 :fuseHawtioEAPVersion: JBoss EAP 6.4