Merge branch 'develop' into fuxml/no-xml-lang

Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
This commit is contained in:
Kijin Sung 2016-01-31 16:13:03 +09:00
commit 4797e858b8
46 changed files with 1230 additions and 143 deletions

View file

@ -0,0 +1 @@
<?php