Skip to content

Commit

Permalink
merge front code
Browse files Browse the repository at this point in the history
  • Loading branch information
lxerxa committed Sep 21, 2019
1 parent a2e45f6 commit 078ea3d
Show file tree
Hide file tree
Showing 32 changed files with 36 additions and 36 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</head>
<body class='layout-docs'>
<div id='content'></div>
<script type="text/javascript" src='/scripts/vender.min.js?v=1.8.4'></script>
<script type="text/javascript" src='/scripts/common.js?v=1.8.4'></script>
<script type="text/javascript" src='/scripts/app.js?v=1.8.4'></script>
<script type="text/javascript" src='/scripts/vender.min.js?v=1.8.5'></script>
<script type="text/javascript" src='/scripts/common.js?v=1.8.5'></script>
<script type="text/javascript" src='/scripts/app.js?v=1.8.5'></script>
</body>
</html>
2 changes: 1 addition & 1 deletion public/scripts/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/scripts/common.js

Large diffs are not rendered by default.

0 comments on commit 078ea3d

Please sign in to comment.