Merge origin/master

tas2580 · tas2580 · commit 85ef6fc9368d · 2015-06-13T00:39:57.000+02:00
diff --git a/ext.php b/ext.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package phpBB Extension - Wiki
- * @copyright (c) 2015 tas2580 (https://tas2580.net)
+* @copyright (c) 2015 tas2580 (https://tas2580.net)
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -12,4 +12,4 @@
 */
 class ext extends \phpbb\extension\base
 {
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`/**`
`3`	`3`	`*`
`4`	`4`	`* @package phpBB Extension - Wiki`
`5`		`- * @copyright (c) 2015 tas2580 (https://tas2580.net)`
	`5`	`+* @copyright (c) 2015 tas2580 (https://tas2580.net)`
`6`	`6`	`* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2`
`7`	`7`	`*`
`8`	`8`	`*/`
`@@ -12,4 +12,4 @@`
`12`	`12`	`*/`
`13`	`13`	`class ext extends \phpbb\extension\base`
`14`	`14`	`{`
`15`		`-}`
	`15`	`+}`