Merge branch 'master' of github.com:gnuboard/g4s

Conflicts: index.php
2012-11-01 13:33:20 +09:00
parent 86e8a4f362 3a4618eb86
commit 4667c8b712
1 changed files with 2 additions and 0 deletions
--- a/index.php
+++ b/index.php
@ -11,6 +11,8 @@ include_once("./_head.php");
 chicpro 님도 참가합니다.<br>
 반갑습니다.
 ZZZZZ
+하하하
+

 <?
 include_once("./_tail.php");