Skip to content

Merge 'develop' branch changes into 'master' branch. #43

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

Merged
Martinski4GitHub merged 21 commits into from
Dec 21, 2025
Merged

Merge 'develop' branch changes into 'master' branch. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e5d5736
Update Create-NewReleases.yml
Martinski4GitHub Jun 18, 2025
f766f8d
Merge branch 'master' of https://github.com/Martinski4GitHub/ntpMerli…
Martinski4GitHub Jun 22, 2025
0d7125e
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Jul 21, 2025
065e9be
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Aug 3, 2025
3b91cc3
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Nov 9, 2025
075bb3b
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Nov 11, 2025
9ddd23b
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Nov 16, 2025
9f09222
Merge branch 'AMTM-OSR:master' into master
Martinski4GitHub Nov 17, 2025
9d1a5b6
Bump actions/checkout from 5.0.0 to 6.0.0 in the all-actions group
dependabot[bot] Nov 24, 2025
d72f33d
Merge pull request #37 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Nov 24, 2025
6a86c2a
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Dec 1, 2025
781e8f7
Merge pull request #38 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Dec 1, 2025
fe90302
Bump actions/checkout from 6.0.0 to 6.0.1 in the all-actions group
dependabot[bot] Dec 8, 2025
11e6a10
Merge pull request #39 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Dec 8, 2025
c71d801
Improvements for the top Main Menu
Martinski4GitHub Dec 16, 2025
ffcc981
Merge pull request #40 from Martinski4GitHub/develop
Martinski4GitHub Dec 16, 2025
57407a7
Fine-Tuning
Martinski4GitHub Dec 17, 2025
be6eeb0
Merge pull request #41 from Martinski4GitHub/develop
Martinski4GitHub Dec 17, 2025
6dea739
Update README.md
Martinski4GitHub Dec 21, 2025
3dea2d3
Merge pull request #42 from Martinski4GitHub/develop
Martinski4GitHub Dec 21, 2025
78ee025
Merge branch 'master' into develop
Martinski4GitHub Dec 21, 2025
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 .github/workflows/Create-NewReleases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
# 1--- Check out master so we tag the exact merge commit
- name: Checkout source code
uses: actions/checkout@v5.0.0
uses: actions/checkout@v6.0.1
with:
fetch-depth: 0
ref: 'master'
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

# 7--- Publish a GitHub Release with auto-generated notes
- name: Create Release with Automated Release Notes
uses: softprops/action-gh-release@v2.4.2
uses: softprops/action-gh-release@v2.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ steps.nextver.outputs.tag }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ntpMerlin

## v3.4.12
### Updated on 2025-Nov-16
## v3.4.13
### Updated on 2025-Dec-20

## About
ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.
Expand Down
Loading