이미지수
ssl enable
Merge branch 'master' of https://github.com/onsaemiro8318/big_coupon
Merge branch 'master' of https://github.com/minivertising/big_coupon
이미지수
force_ssl disable
영상 썸네일 추
Merge branch 'master' of https://github.com/onsaemiro8318/big_coupon
지금까지 한
Merge branch 'master' of https://github.com/minivertising/big_coupon

Conflicts:
	app/views/pc/home/index.html.erb
Merge branch 'master' of https://github.com/onesup/big_coupon