Merge branch 'master' of github.com:jenniferahoward/ck-js-todo

Conflicts: bower.json test/indexSpec.js
andrew-codes · Apr 2, 2014 · 01308f1 · 01308f1
2 parents 4a981c9 + a7c19d3
commit 01308f1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/config.js b/app/config.js
@@ -9,11 +9,15 @@ requirejs.config({
         'transitions': '../bower_components/durandal/js/transitions',
         'jquery': '../bower_components/jquery/jquery',
         'knockout': '../bower_components/knockout.js/knockout',
-        'bootstrap': '../bower_components/bootstrap/dist/js/bootstrap'
+        'bootstrap': '../bower_components/bootstrap/dist/js/bootstrap',
+        'sinon': '../bower_components/sinon/lib/sinon'
     },
     shim: {
         'bootstrap': {
             deps: ['jquery']
+        },
+        'sinon': {
+            exports: 'sinon'
         }
     }
 });