g4s merge 충돌수정

2013-06-25 16:40:16 +09:00
parent 5cb1c0519e 5bc81f27a9
commit 5ca0975f21
7 changed files with 50 additions and 46 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,5 @@ rankiss*
 thumb.lib.php
 test.php
 g4s_tree
+itzimara*
+nemoluv*