Merge remote-tracking branch 'upstream-github/master'

Conflicts:
	package.json
This commit is contained in:
Paul T 2018-06-30 17:42:03 -04:00
commit b3da046a92
5 changed files with 7 additions and 7 deletions

View file

@ -75,6 +75,6 @@
</head>
<body>
<div id="app"></div>
<script src="static/dist/bundle.js?v=18"></script>
<script src="static/dist/bundle.js?v=19" async></script>
</body>
</html>

File diff suppressed because one or more lines are too long

Binary file not shown.

10
static/dist/bundle.js vendored

File diff suppressed because one or more lines are too long

Binary file not shown.