Merge remote-tracking branch 'origin/master'

urish · Mar 24, 2015 · 5ebc3b3 · 5ebc3b3
2 parents d74e5b3 + 897099a
commit 5ebc3b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/angular-moment.js b/angular-moment.js
@@ -511,6 +511,7 @@
 		define(['angular', 'moment'], angularMoment);
 	} else if (typeof module !== 'undefined' && module && module.exports) {
 		angularMoment(angular, require('moment'));
+		module.exports = 'angularMoment';
 	} else {
 		angularMoment(angular, window.moment);
 	}

diff --git a/angular-moment.min.js b/angular-moment.min.js
diff --git a/angular-moment.min.js.map b/angular-moment.min.js.map