merge 충돌

2013-10-14 15:08:34 +09:00
parent c39eb7f019 cfd8db6b9e
commit 51938f0a2b
54 changed files with 4210 additions and 3191 deletions
--- a/plugin/kcaptcha/kcaptcha_session.php
+++ b/plugin/kcaptcha/kcaptcha_session.php
@ -1,4 +1,4 @@
-<?
+<?php
 include_once("_common.php");
 header("Content-Type: text/html; charset=$g4[charset]");
 require(dirname(__FILE__).'/kcaptcha_config.php');