Skip to content

sync: back-merge master into develop - #1090

Open
vichugofsl wants to merge 14 commits into
developfrom
sync-master-into-develop
Open

sync: back-merge master into develop#1090
vichugofsl wants to merge 14 commits into
developfrom
sync-master-into-develop

Conversation

@vichugofsl

Copy link
Copy Markdown
Collaborator

Reconcile cherry-picked releases (Task-89223/89367/90749/92918, Ticket-90116) back into develop; advance merge-base so future develop→master release PRs stay conflict-free.

BrBrane and others added 14 commits April 16, 2026 11:10
Dev to main: Soft-delete organizations, Localize Reset Password, Fix invalid HLS playlist
…aster

Update CODEOWNERS for master branch
…_segmentation=true and verify_content=true.

(cherry picked from commit f471d34)
…eter and `segmentation_type` is no longer duplicated under `books[].filesets[]`.

(cherry picked from commit d553c03)
…endpoint-access-control

Task-89223 [FD 16325] users endpoint exposed to all valid API keys (prod release)
…n-verse-starts-to-master

Task-90116/90749 Release: segmentation_type + verse_starts (cherry-pick #1079, #1080, #1083)
…ss throttling behind the AWS ALB.

(cherry picked from commit 959bd59)
…itelist-to-master

Task-89367 Release: IP whitelist for live.bible.is in Public API (cherry-pick #1072, #1087)
@vichugofsl vichugofsl self-assigned this Jun 23, 2026
@sonarqubecloud

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants