diff --git a/.github/standardizer.yml b/.github/standardizer.yml index fceb69df1..27dad4cbd 100644 --- a/.github/standardizer.yml +++ b/.github/standardizer.yml @@ -1,3 +1,17 @@ +# Copyright © 2024 OpenIM. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # https://github.com/marketplace/actions/conformity-checker-for-project baseConfig: searchDirectory: "./" diff --git a/CHANGELOG/CHANGELOG-3.6.md b/CHANGELOG/CHANGELOG-3.6.md index 214d58340..f11cfc7cc 100644 --- a/CHANGELOG/CHANGELOG-3.6.md +++ b/CHANGELOG/CHANGELOG-3.6.md @@ -8,6 +8,9 @@ ## [Unreleased] + +## [v3.6.1-beta.0] - 2024-03-26 + ## v3.6.0 - 2024-03-07 ### Reverts @@ -17,4 +20,5 @@ - Merge branch 'tuoyun' -[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.6.0...HEAD +[Unreleased]: https://github.com/openimsdk/open-im-server/compare/v3.6.1-beta.0...HEAD +[v3.6.1-beta.0]: https://github.com/openimsdk/open-im-server/compare/v3.6.0...v3.6.1-beta.0 diff --git a/pkg/common/config/version b/pkg/common/config/version index 40c341bdc..9575d51ba 100644 --- a/pkg/common/config/version +++ b/pkg/common/config/version @@ -1 +1 @@ -3.6.0 +3.6.1