mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1648 from nextcloud/bump_moment_js 

Bump moment.js
This commit is contained in:
Roeland Jago Douma 2016-10-07 13:19:07 +02:00 committed by GitHub
parent 0dce8fdd63 286f34146a
commit 9e7824f3ed
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/vendor/moment/.bower.json vendored
View File

@ -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",

8
core/vendor/moment/min/moment-with-locales.js vendored
View File

@ -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);