Skip to content

Sync fork - #24

Merged
jay-oswald merged 15 commits into
MOODLE_405_STABLE-catalystfrom
sync-fork
Nov 14, 2025
Merged

Sync fork#24
jay-oswald merged 15 commits into
MOODLE_405_STABLE-catalystfrom
sync-fork

Conversation

@jwalits

@jwalits jwalits commented Nov 12, 2025

Copy link
Copy Markdown
git merge --no-edit upstream/MOODLE_405_STABLE
Auto-merging settings.php
Auto-merging version.php
CONFLICT (content): Merge conflict in version.php
Automatic merge failed; fix conflicts and then commit the result.

Resolved version.php conflict and bumped the version to 2025092301 from 2025092300

@jay-oswald
jay-oswald self-requested a review November 14, 2025 01:32
@jay-oswald
jay-oswald merged commit f99ba9d into MOODLE_405_STABLE-catalyst Nov 14, 2025
34 checks passed
@jay-oswald
jay-oswald deleted the sync-fork branch November 14, 2025 01:33
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.

3 participants