Skip to content

Commit

Permalink
Merge branch 'main' into testdriver
Browse files Browse the repository at this point in the history
  • Loading branch information
Frooodle authored Oct 22, 2024
2 parents 6ad1fa0 + aa00808 commit 48d4871
Show file tree
Hide file tree
Showing 141 changed files with 6,479 additions and 1,541 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ watchedFolders/
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
*.db
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you would like to add or modify a translation, please see [How to add new lan

## Docs

Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/).

## Fixing Bugs or Adding a New Feature

Expand All @@ -41,4 +41,4 @@ If, at any point of time, you have a question, please feel free to ask in the sa

## License

By contributing to this project, you agree that your contributions will be licensed under the [GPL 3 License](LICENSE). You also acknowledge and agree that your contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.
By contributing to this project, you agree that your contributions will be licensed under the [MIT License](LICENSE).
Loading

0 comments on commit 48d4871

Please sign in to comment.