Merge branch 'develop' of https://github.com/rhymix/rhymix into pr/communication

# Conflicts:
#	modules/communication/communication.controller.php
This commit is contained in:
conory 2016-03-06 17:23:19 +09:00
commit 65dc36f661
189 changed files with 842 additions and 1120 deletions

View file

@ -1,5 +1,4 @@
<?php
$lang->about_communication = '회원간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행합니다';
$lang->allow_message = 'Permitir la recepción del mensaje';
$lang->allow_message_type['Y'] = 'Recibir todo';
$lang->allow_message_type['N'] = 'Rechazar';