删除test.txt

删除
uccilent
add uc_cilent

add
UC整合 入口文件处载入uc
uc 文件

1
Merge branch 'master' into robin

Conflicts:
	index.php
	nbproject/private/private.xml
	themes/default/views/layouts/main.php
uc同步注册及uid隐射表

1
使用UC进行登录

rt
Merge branch 'robin' of https://github.com/yhxxlm/uscar into robin
修复

1
修复 UC登录

1
Merge branch 'master' into robin

Conflicts:
	index.php
	protected/modules/user/controllers/RegistrationController.php
Merge branch 'master' into robin

Conflicts:
	index.php
合并后修复文件

1
UC同步修改密码

1
Merge branch 'master' into robin

Conflicts:
	protected/models/LoginForm.php
Merge branch 'master' into robin
用户资料验证器

手机,身份证验证类,后台入口加入uc
Merge branch 'master' into robin

Conflicts:
	.gitignore
	backend.php
前后台导入分离