diff --git a/CHANGELOG.md b/CHANGELOG.md index 222b599b4..e8b970318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Update for 2025-01-21 +- **Contributing**: + - if you'd like to contribute, please see updated [contributing](https://github.com/vladmandic/automatic/blob/dev/CONTRIBUTING) guidelines - **Model Merge** - replace model components and merge LoRAs in addition to existing model weights merge support diff --git a/CONTRIBUTING b/CONTRIBUTING index a322cb97e..f6187fa17 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -23,4 +23,5 @@ Procedure for contributing: - Make sure that PR does NOT include any unrelated edits - Make sure that PR does not include changes to submodules -Your pull request will be reviewed and pending review results, merged into main branch +Your pull request will be reviewed and pending review results, merged into `dev` branch +Dev merges to main are performed regularly and any PRs that are merged to `dev` will be included in the next main release diff --git a/wiki b/wiki index 1e3ebab7d..faaee0ec3 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 1e3ebab7dcb772a6ad4e4c03be97973c72c36fa4 +Subproject commit faaee0ec3686c8e37fbd55b78385ef343c560847