mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
This commit is contained in:
Andreas Fischer
2012-01-02 17:36:21 +01:00
parent d018b0b5f1 fd55d64996
commit a01e916737
72 changed files with 72 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mock/cache.php
View File

@@ -3,7 +3,7 @@
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/

2
tests/mock/session_testable.php
View File

@@ -3,7 +3,7 @@
*
* @package testing
* @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/