Merge branch 'dev'

3 anni fa · 98cbbf5c32
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -86,7 +86,7 @@
    {/if}
    <!--@formatter:on-->
 </head>
 <body style="background-image: url('/assets/img/login-back.jpg')">
 <body style="background-image: url('/assets/img/login-back1.jpg')">
 <div class="container">
    <div class="login-wrapper">
        <div class="login-screen">
--- a/public/assets/img/login-back.jpg
+++ b/public/assets/img/login-back.jpg
--- a/public/assets/img/login-back1.jpg
+++ b/public/assets/img/login-back1.jpg