Skip to content

[bot] Merge 26.3 to 26.7 (Conflicts) #1862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 4 commits into
base: release26.7-SNAPSHOT
Choose a base branch
from
Open

[bot] Merge 26.3 to 26.7 (Conflicts) #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31aac1f
Migrate onprc_ehr scripts to PostgreSQL (#1805)
labkey-adam Aug 18, 2026
30938fd
Modified demographics grid to include listing of cage mates separated…
Ohsudev Aug 18, 2026
22194f3
Bump SLAModule and ONPRC_BillingModule to 26.000 (#1857)
labkey-adam Aug 20, 2026
b059ae8
Reset branch to release26.7-SNAPSHOT before merging and resolving con…
labkey-teamcity Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions onprc_billing/module.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ModuleClass: org.labkey.onprc_billing.ONPRC_BillingModule
SupportedDatabases: mssql
SupportedDatabases: mssql, pgsql
License: Apache 2.0
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
ManageVersion: false
ManageVersion: true
Loading