Merge branch 'master' into release-1.0.4

phpbb-extensions · Jul 4, 2015 · 32cd34a · 32cd34a
2 parents ef3ad17 + 56595a6
commit 32cd34a
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /build/
+/vendor/
diff --git a/acp/board_announcements_module.php b/acp/board_announcements_module.php
@@ -209,7 +209,7 @@ public function main($id, $mode)
 			'U_ACTION'				=> $this->u_action,
 		));
 
-		// Assigning custom bbcodes
+		// Build custom bbcodes array
 		display_custom_bbcodes();
 	}
 }
diff --git a/composer.lock b/composer.lock