You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

sw ce526fde77 Merge branch 'dev_zanle' into szzh ... Conflicts: config/routes.rb		10 years ago
..
extra/redmine_pm	1.修改测试环境搭建文档	11 years ago
fixtures	<merge code from dev_dingxu>	11 years ago
functional	Merge branch 'szzh' into dev_zanle	10 years ago
integration	Signed-off-by: alan <547533434@qq.com>	11 years ago
mobile	将注册功能移动到UserService中	11 years ago
mocks	1.修改测试环境搭建文档	11 years ago
performance	导航栏防止意外http参数不全的错误	11 years ago
ui	1.修改测试环境搭建文档	11 years ago
unit	Merge branch 'szzh' into dev_zanle	10 years ago
object_helpers.rb	1.修改测试环境搭建文档	11 years ago
test_helper.rb	自动化测试环境	11 years ago