Merge branch 'master' into otr

Conflicts: main.js
2013-08-30 21:18:29 +02:00 · 2013-08-30 21:18:29 +02:00 · 48b6898a2e
commit 48b6898a2e
parent e4cf875d24 d5df785a2a
1 changed files with 1 additions and 1 deletions
--- a/main.js
+++ b/main.js
@ -30,7 +30,7 @@ require.config({
        'crypto.aes': {
            exports: 'CryptoJS'
        },
-        'tinysort': { deps: ['jquery'] },
+        'jquery.tinysort': { deps: ['jquery'] },
        'strophe': { deps: ['jquery'] },
        'underscore':   { exports: '_' },
        'strophe.muc':  { deps: ['strophe', 'jquery'] },