Resolve the conflicts for #228

2025-06-15 04:26:05 +00:00 · 2018-04-02 13:38:53 +07:00
parent 6e07017361 e8673131b3
commit 17a892b18d
32 changed files with 1103 additions and 130 deletions
--- a/app/templates/base.html
+++ b/app/templates/base.html
@ -83,7 +83,7 @@
                    <small>{{ current_user.role.name }}</small>
                  </p>
                </li>
-            
+
              <!-- Menu Footer-->
              <li class="user-footer">
                <div class="pull-left">