Skip to content

Commit

Permalink
Merge branch 'main' into new_build
Browse files Browse the repository at this point in the history
# Conflicts:
#	endpoint/register/pypush_gsa_icloud.py
#	version
  • Loading branch information
danny committed Feb 7, 2025
2 parents 629a7f9 + 3bcfafb commit 2c847ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Included projects are (Credits goes to them for the hard work):

Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)

## Disclaimer

Expand Down

0 comments on commit 2c847ce

Please sign in to comment.