]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
fix conflict between makeGlobal PRs
authorIsaac Cambron <isaac@isaaccambron.com>
Fri, 22 Nov 2013 18:48:26 +0000 (13:48 -0500)
committerIsaac Cambron <isaac@isaaccambron.com>
Fri, 22 Nov 2013 18:48:26 +0000 (13:48 -0500)
moment.js

index 3df90f0ce75516f17be67e56688503080d9f1bf6..5b46691b2edb47b5eaf6e8b9252135915feccf57 100644 (file)
--- a/moment.js
+++ b/moment.js
                 }
                 return local_moment.apply(null, arguments);
             };
-            extend(this.moment, local_moment);
+            extend(global.moment, local_moment);
         } else {
             global['moment'] = moment;
         }