Merge branch 'master' into ui

2017-06-09 09:47:43 -04:00 · 2017-06-09 09:47:43 -04:00 · b442b65f72
commit b442b65f72
parent dea589df14 29cdc077e8
11 changed files with 720 additions and 54 deletions
--- a/frontend/src/upload.js
+++ b/frontend/src/upload.js
@ -1,4 +1,5 @@
 const FileSender = require('./fileSender');
+const $ = require('jquery');

 $(document).ready(function() {
  // reset copy button