linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop ... Conflicts: app/controllers/account_controller.rb		2014-06-23 15:06:37 +08:00
..
en.yml	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop	2014-06-23 15:06:37 +08:00