projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14874-protected-collection-properties'
[arvados.git]
/
apps
/
workbench
/
app
/
assets
/
javascripts
/
application.js
diff --git
a/apps/workbench/app/assets/javascripts/application.js
b/apps/workbench/app/assets/javascripts/application.js
index bba2f9dcc044b8b20b42e12cac8c62af5c4846f4..1898128133535014f795bafaee942e10c6ff058d 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/application.js
+++ b/
apps/workbench/app/assets/javascripts/application.js
@@
-26,13
+26,14
@@
//= require bootstrap/button
//= require bootstrap3-editable/bootstrap-editable
//= require bootstrap-tab-history
//= require bootstrap/button
//= require bootstrap3-editable/bootstrap-editable
//= require bootstrap-tab-history
-//= require wiselinks
//= require angular
//= require raphael
//= require morris
//= require jquery.number.min
//= require npm-dependencies
//= require mithril/stream/stream
//= require angular
//= require raphael
//= require morris
//= require jquery.number.min
//= require npm-dependencies
//= require mithril/stream/stream
+//= require awesomplete
+//= require jssha
//= require_tree .
Es6ObjectAssign.polyfill()
//= require_tree .
Es6ObjectAssign.polyfill()