nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop ... Conflicts: app/views/layouts/_base_footer.html.erb		2014-07-11 09:11:37 +08:00
..
en.yml	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
zh.yml	Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop	2014-07-11 09:11:37 +08:00