alan 972b788687 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: public/stylesheets/application.css Signed-off-by: alan <547533434@qq.com>		2014-11-19 17:30:53 +08:00
..
en.yml	调整按钮样式	2014-11-03 18:34:06 +08:00
zh.yml	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2014-11-19 17:30:53 +08:00