Commit d427f9a7 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent c2b2faad
......@@ -851,7 +851,7 @@ a,a:hover,a:link {
padding-right: 15px;
}
.yun-login-btn {
padding-right: 15px;
margin-right: 15px;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment