Skip to content

Ticket/9916 olympus#522

Merged
bantu merged 3 commits into
phpbb:develop-olympusfrom
michaelcullum:ticket/9916-olympus
Jan 2, 2012
Merged

Ticket/9916 olympus#522
bantu merged 3 commits into
phpbb:develop-olympusfrom
michaelcullum:ticket/9916-olympus

Conversation

@michaelcullum

Copy link
Copy Markdown
Contributor

Develop Changes: #509

http://tracker.phpbb.com/browse/PHPBB3-9916

PHPBB3-9916

@michaelcullum

Copy link
Copy Markdown
Contributor Author

I've put coding guidelines and test headers in seperate commits but I can squash them if you want.

@p

p commented Dec 31, 2011

Copy link
Copy Markdown
Contributor

No, this is better but in the second commit you need a space after [ticket/9916].

@michaelcullum

Copy link
Copy Markdown
Contributor Author

Done

@bantu

bantu commented Jan 2, 2012

Copy link
Copy Markdown
Collaborator

A few files seem to be missing.

grep "http://opensource.org/licenses/gpl-license.php" . -R | grep -v "/phpBB/" (after merge)
./build/diff_class.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License ./build/build_diff.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License ./build/build_diff.php: $html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n"; ./build/package.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License ./build/build_changelog.php:* @license http://opensource.org/licenses/gpl-license.php GNU General Public License ./build/build_helper.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License ./git-tools/merge.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License ./git-tools/setup_github_network.php:* @license http://opensource.org/licenses/gpl-license.php GNU Public License

@bantu

bantu commented Jan 2, 2012

Copy link
Copy Markdown
Collaborator

And a few more files in phpBB/docs and phpBB/develop which are also safe to change.

@michaelcullum

Copy link
Copy Markdown
Contributor Author

Ah ok. I'll do this today.

@bantu bantu merged commit 5e52734 into phpbb:develop-olympus Jan 2, 2012
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.

3 participants