Skip to content

Commit

Permalink
Merge branch 'version-bump' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrufus committed Aug 18, 2020
2 parents db7a9cc + ee9fd6b commit 5951eb0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 186 deletions.
4 changes: 0 additions & 4 deletions .github_changelog_generator

This file was deleted.

171 changes: 0 additions & 171 deletions CHANGELOG.md

This file was deleted.

5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
- [Where can I give :star::star::star::star::star: reviews?](#where-can-i-give-starstarstarstarstar-reviews)
- [Testing](#testing)
- [Feedback](#feedback)
- [Change Log](#change-log)
- [Security](#security)
- [Credits](#credits)
- [License](#license)
Expand Down Expand Up @@ -369,10 +368,6 @@ Pull requests without tests will not be accepted!
Please submit an [issue](https://github.com/ItinerisLtd/wp-phpmailer/issues/new) and point out what you do and don't like, or fork the project and make suggestions.
**No issue is too small.**

## Change Log

Please see [CHANGELOG](./CHANGELOG.md) for more information on what has changed recently.

## Security

If you discover any security related issues, please email [dev@itineris.co.uk](mailto:dev@itineris.co.uk) instead of using the issue tracker.
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
},
"conflict": {
"itinerisltd/phpmailer-mailhog": "*",
"wpackagist-plugin/sendgrid-email-delivery-simplified": "*",
"johnpbloch/wordpress-core": "^5.5",
"roots/wordpress": "^5.5"
"roots/wordpress": "^5.5",
"wpackagist-plugin/sendgrid-email-delivery-simplified": "*"
},
"require-dev": {
"10up/wp_mock": "^0.4.2",
Expand Down Expand Up @@ -82,7 +82,6 @@
"@phpstan:analyse",
"@style:check",
"composer normalize",
"github_changelog_generator --no-verbose",
"npx doctoc README.md"
],
"release:build": [
Expand Down
5 changes: 3 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wp-phpmailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Plugin Name: WP PHPMailer
* Plugin URI: https://github.com/ItinerisLtd/wp-phpmailer
* Description: WP PHPMailer provides a clean and simple way to configure WordPress-bundled PHPMailer library, allowing you to quickly get started sending mail through a local or cloud based service of your choice.
* Version: 0.1.2
* Version: 0.1.5
* Author: Itineris Limited
* Author URI: https://itineris.co.uk
* License: MIT
Expand Down

0 comments on commit 5951eb0

Please sign in to comment.