Commit graph

1 commit

Author SHA1 Message Date
Kijin Sung
4797e858b8 Merge branch 'develop' into fuxml/no-xml-lang
Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
2016-01-31 16:13:03 +09:00