Skip to content

Master Resync#1868

Merged
peternewman merged 28 commits intoOpenLightingProject:masterfrom
DaAwesomeP:master
Jun 22, 2023
Merged

Master Resync#1868
peternewman merged 28 commits intoOpenLightingProject:masterfrom
DaAwesomeP:master

Conversation

@DaAwesomeP
Copy link
Copy Markdown
Member

For #1801

DaAwesomeP and others added 25 commits June 18, 2023 16:51
Co-authored-by: Flo Edelmann <git@flo-edelmann.de>
Co-authored-by: Flo Edelmann <git@flo-edelmann.de>
Co-authored-by: Flo Edelmann <git@flo-edelmann.de>
…P-GitHubActionsWeblint

GitHub Actions Lint: weblint
…P-GitHubActionsRemovePython2

GitHub Actions Remove Python 2
…P-GitHubActionsDebianBuildsTrixie

Github Actions Debian trixie
Co-authored-by: Peter Newman <peternewman@users.noreply.github.com>
Co-authored-by: Peter Newman <peternewman@users.noreply.github.com>
…link

Co-authored-by: Peter Newman <peternewman@users.noreply.github.com>
…P-update-readme-status-badge

Update README build badges and replace some Travis references
@DaAwesomeP
Copy link
Copy Markdown
Member Author

@peternewman reminder to add weblint to the required checks.

@DaAwesomeP
Copy link
Copy Markdown
Member Author

This pull also includes #1869 (pull for 0.10) but for the master branch.

Copy link
Copy Markdown
Member

@peternewman peternewman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks!

@peternewman peternewman added this to the 0.11.0 milestone Jun 22, 2023
@peternewman peternewman enabled auto-merge June 22, 2023 05:07
@peternewman
Copy link
Copy Markdown
Member

This pull also includes #1869 (pull for 0.10) but for the master branch.

I'd generally just wait for the next merge if possible, then we can almost merge the resyncs blind as there's no new code in them.

@peternewman
Copy link
Copy Markdown
Member

@peternewman reminder to add weblint to the required checks.

Done thanks! 👍

@peternewman peternewman merged commit 70a7f7b into OpenLightingProject:master Jun 22, 2023
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.

2 participants