Skip to content

Commit 4d9434e

Browse files
committed
5.2.6 release
See changelog
1 parent de5f041 commit 4d9434e

File tree

7 files changed

+407
-445
lines changed

7 files changed

+407
-445
lines changed

README.md

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,21 @@ You'll find some basic user-level docs in the docs folder, and you can generate
9595

9696
You'll find a PHPUnit test script in the `test` folder.
9797

98-
Build status: [![Build Status](https://travis-ci.org/Synchro/PHPMailer.png)](https://travis-ci.org/Synchro/PHPMailer)
98+
Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.png)](https://travis-ci.org/PHPMailer/PHPMailer)
9999

100100
If this isn't passing, is there something you can do to help?
101101

102102
## Contributing
103103

104-
Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/Synchro/PHPMailer/issues).
104+
Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
105105

106106
We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
107107

108-
Please *don't* use the SourceForge project any more.
108+
With the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
109+
110+
git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
111+
112+
Please *don't* use the SourceForge or Google Code projects any more.
109113

110114
## Changelog
111115

@@ -114,16 +118,17 @@ See changelog.md
114118
## History
115119
- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
116120
- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004.
117-
- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski
118-
- Marcus started this fork on [GitHub](https://github.com/Synchro/PHPMailer)
121+
- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
122+
- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer).
119123
- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer.
124+
- PHPMailer moves to the [PHPMailer organisation](https://github.com/PHPMailer) on GitHub.
120125

121126
### What's changed since moving from SourceForge?
122-
- Official successor to the SourceForge and Google Code projects
123-
- Test suite
124-
- Continuous integration with Travis-CI
125-
- Composer support
126-
- Rolling releases
127-
- Additional languages and language strings
128-
- CRAM-MD5 authentication support
129-
- Preserves full repo history of authors, commits and branches from the original SourceForge project
127+
- Official successor to the SourceForge and Google Code projects.
128+
- Test suite.
129+
- Continuous integration with Travis-CI.
130+
- Composer support.
131+
- Rolling releases.
132+
- Additional languages and language strings.
133+
- CRAM-MD5 authentication support.
134+
- Preserves full repo history of authors, commits and branches from the original SourceForge project.

0 commit comments

Comments
 (0)