Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

6 years ago · db1298a2d7
parent a7b3e33ada f41822308f
commit db1298a2d7
3 changed files with 1 additions and 1 deletions
--- a/src/main/ui/static/activity/loving_merchants/loving_merchants_intro.html
+++ b/src/main/ui/static/activity/loving_merchants/loving_merchants_intro.html
@ -28,7 +28,7 @@
 </header>
 <div class="content">
    <div class="banner_img">
-        <img height="112" width="344" src="/static/images/loving_merchants/banner.png">
+        <img height="112" width="344" src="/static/images/loving_merchants/banner.jpg">
    </div>
    <div class="circular_img">
        <img src="/static/images/loving_merchants/circular.png">
--- a/src/main/ui/static/images/loving_merchants/banner.jpg
+++ b/src/main/ui/static/images/loving_merchants/banner.jpg
--- a/src/main/ui/static/images/loving_merchants/banner.png
+++ b/src/main/ui/static/images/loving_merchants/banner.png