diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 17:36:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 17:36:21 +0100 |
| commit | a01e916737c39c8d9d53c82647c92871f5c18caa (patch) | |
| tree | ce1e412e48bac2372f9ae61673851d0d392721bd /phpBB/develop/merge_post_tables.php | |
| parent | d018b0b5f161c3f0c468dc01af301b4b745c30cb (diff) | |
| parent | fd55d64996637084096ec83f84c5f007959c9fcd (diff) | |
| download | forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.gz forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.bz2 forums-a01e916737c39c8d9d53c82647c92871f5c18caa.tar.xz forums-a01e916737c39c8d9d53c82647c92871f5c18caa.zip | |
Merge branch 'develop-olympus' into develop
* 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
Diffstat (limited to 'phpBB/develop/merge_post_tables.php')
| -rw-r--r-- | phpBB/develop/merge_post_tables.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php index e7e22409a5..d13ae287b5 100644 --- a/phpBB/develop/merge_post_tables.php +++ b/phpBB/develop/merge_post_tables.php @@ -6,7 +6,6 @@ * copyright : (C) 2003 The phpBB Group * email : support@phpbb.com * - * $Id$ * ***************************************************************************/ |