Merge branch '2.1.x'

2015-06-03 15:39:34 +02:00
parent ba684e1025 cddeb1eeac
commit efdfa5a074
28 changed files with 286 additions and 167 deletions
--- a/composer.json
+++ b/composer.json
@@ -3,8 +3,8 @@
 	"type": "phpbb-extension",
 	"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
 	"homepage": "http://www.board3.de",
-	"version": "2.1.0-rc3",
-	"time": "2015-05-07 14:01:15",
+	"version": "2.1.0",
+	"time": "2015-05-07 14:47:44",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "Marc Alexander",