diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-10-07 13:19:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 13:19:07 +0200 |
| commit | 9e7824f3edcb498447915a396e93678ddb6f5768 (patch) | |
| tree | 7f9d612f6892dbc839737215a7289db75f473f1c /core/vendor | |
| parent | 0dce8fdd63ffab21f1deffd640868a44b51339c8 (diff) | |
| parent | 286f34146a005619842e58da1fb638b894efeb5d (diff) | |
| download | nextcloud-server-9e7824f3edcb498447915a396e93678ddb6f5768.tar.gz nextcloud-server-9e7824f3edcb498447915a396e93678ddb6f5768.zip | |
Merge pull request #1648 from nextcloud/bump_moment_js
Bump moment.js
Diffstat (limited to 'core/vendor')
| -rw-r--r-- | core/vendor/moment/.bower.json | 9 | ||||
| -rw-r--r-- | core/vendor/moment/min/moment-with-locales.js | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/core/vendor/moment/.bower.json b/core/vendor/moment/.bower.json index 58c7c593575..ab74d34130a 100644 --- a/core/vendor/moment/.bower.json +++ b/core/vendor/moment/.bower.json @@ -1,5 +1,6 @@ { "name": "moment", + "license": "MIT", "main": "moment.js", "ignore": [ "**/.*", @@ -20,12 +21,12 @@ "package.json" ], "homepage": "https://github.com/moment/moment", - "version": "2.15.0", - "_release": "2.15.0", + "version": "2.15.1", + "_release": "2.15.1", "_resolution": { "type": "version", - "tag": "2.15.0", - "commit": "0d01bda39d30c904977d385d2e5352c6a02600dc" + "tag": "2.15.1", + "commit": "d3f9a749f0e27ea7ec6e8de3719247d132b357a7" }, "_source": "https://github.com/moment/moment.git", "_target": "^2.15.0", diff --git a/core/vendor/moment/min/moment-with-locales.js b/core/vendor/moment/min/moment-with-locales.js index e6afacc63aa..1388ae65e5b 100644 --- a/core/vendor/moment/min/moment-with-locales.js +++ b/core/vendor/moment/min/moment-with-locales.js @@ -1,5 +1,5 @@ //! moment.js -//! version : 2.15.0 +//! version : 2.15.1 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors //! license : MIT //! momentjs.com @@ -1791,10 +1791,10 @@ var oldLocale = null; // TODO: Find a better way to register and load all the locales in Node if (!locales[name] && (typeof module !== 'undefined') && - module && module.require) { + module && module.exports) { try { oldLocale = globalLocale._abbr; - module.require('./locale/' + name); + require('./locale/' + name); // because defineLocale currently also sets the global locale, we // want to undo that for lazy loaded locales locale_locales__getSetGlobalLocale(oldLocale); @@ -4197,7 +4197,7 @@ ; - utils_hooks__hooks.version = '2.15.0'; + utils_hooks__hooks.version = '2.15.1'; setHookCallback(local__createLocal); |