aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-25 23:15:30 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-25 23:15:30 +0100
commit94d90c084b460a1e166db8b2f42fe181eeb9d272 (patch)
tree777b5d3f9bfddcd4e1e2725b7f52e96485be4479
parent74dfb56459fda73bbfe92f9527b5365e79d1f18d (diff)
parentaa3a46a35f086fa3462c9a7b32da5dbad08aa350 (diff)
downloadforums-94d90c084b460a1e166db8b2f42fe181eeb9d272.tar
forums-94d90c084b460a1e166db8b2f42fe181eeb9d272.tar.gz
forums-94d90c084b460a1e166db8b2f42fe181eeb9d272.tar.bz2
forums-94d90c084b460a1e166db8b2f42fe181eeb9d272.tar.xz
forums-94d90c084b460a1e166db8b2f42fe181eeb9d272.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v312.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v312.php b/phpBB/phpbb/db/migration/data/v31x/v312.php
index 12a3ec3ae6..bf49935f4d 100644
--- a/phpBB/phpbb/db/migration/data/v31x/v312.php
+++ b/phpBB/phpbb/db/migration/data/v31x/v312.php
@@ -1,15 +1,15 @@
<?php
/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
namespace phpbb\db\migration\data\v31x;