milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-14 12:04:42 -05:00
parent d96250df7f
commit bcfee41a57
318 changed files with 54424 additions and 6419 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/bower_components/jquery/src/jquery.js vendored
View file

@ -1,4 +1,4 @@
define([
define( [
"./core",
"./selector",
"./traversing",
@ -11,6 +11,7 @@ define([
"./attributes",
"./event",
"./event/alias",
"./event/focusin",
"./manipulation",
"./manipulation/_evalUrl",
"./wrap",
@ -28,10 +29,9 @@ define([
"./offset",
"./dimensions",
"./deprecated",
"./exports/amd",
"./exports/global"
"./exports/amd"
], function( jQuery ) {
return jQuery;
return ( window.jQuery = window.$ = jQuery );
});
} );