liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
..
in initial
selfbuilt initial
agreement.css initial
animate.min.css initial
base.css initial
base1.css Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.
business.css initial
collaborate.css 新增分支dev_lww
common.css initial
dialog_base.css initial
down.css initial
download.css initial
foot.css pc端官网修改
game.css initial
gamecenter.css initial
gift.css initial
global.css initial
heard.css PC官网修改
home.css initial
home_login.css initial
home_register.css initial
iconfont.css initial
index.css pc官网修改
index_about.css initial
jftbase.css initial
jftindex.css initial
jftstyle.css initial
jianhu.css initial
login.css initial
main_pq.css initial
new.css initial
news.css initial
pay.css initial
pig.css initial
product.css 新增分支dev_lww
profile.css initial
public.css 官网-底部间距调整
recharge.css pc官网-充值页面修改
reg.css initial
reset.css pc端官网修改
resetpwd.css initial
safe.css initial
service.css pc端官网修改
service11.css initial
style.css initial
sub.css initial
supervise.css Merge branch 'dev' into dev_lww
swiper.min.css initial
user.css initial
viewer.min.css initial
webuploader.css initial