[myshop/coupon/new] Fix: display of coupon image.
Merge branch 'develop' of https://github.com/TomoakiNagahara/OpenCoupon into develop
[myshop/coupon/new] Fix: File that are in conflict has been saved.
[merge]
[js] New: Added new
Merge branch 'develop' of https://github.com/TomoakiNagahara/OpenCoupon into develop
[htaccess] Fix: Support ico file