1
0
mirror of /repos/Prototyper.git synced 2025-12-30 06:31:32 +01:00

Merge remote-tracking branch 'origin/master'

Conflicts:
	preview.js
This commit is contained in:
Aiko Mastboom 2013-04-28 22:52:16 +02:00
commit cb56c1b259

View File

@ -110,7 +110,7 @@ module.exports = function (config, mongoDataInstance) {
return keys_to_collect[key];
} else {
keys_to_collect[key] = null;
return "wating for content";
return "waiting for content";
}
}
}