Skip to content

L
laravelzh
Commit 0bd713ac authored by 冯超鹏's avatar 冯超鹏
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh

parents da38b46b 46c79af9
Pipeline #27 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 1 deletion
      .gitignore
      View file @ 0bd713ac
      ...@@ -22,3 +22,4 @@ Homestead.yaml ...@@ -22,3 +22,4 @@ Homestead.yaml
      npm-debug.log npm-debug.log
      yarn-error.log yarn-error.log
      .DS_Store .DS_Store
      composer.lock
      resources/views/laravue.blade.php
      View file @ 0bd713ac
      ...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
      <script src=/static/tinymce4.7.5/tinymce.min.js></script> <script src=/static/tinymce4.7.5/tinymce.min.js></script>
      <script src="{{ mix('js/vendor.js') }}"></script> <script src="{{ mix('js/vendor.js') }}"></script>
      <!-- <script src="{{ mix('js/manifest.js') }}"></script> --> <script src="{{ mix('js/manifest.js') }}"></script>
      <script src="{{ mix('js/app.js') }}"></script> <script src="{{ mix('js/app.js') }}"></script>
      </body> </body>
      </html> </html>
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment