Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality

Conflicts:
	src/database.js
This commit is contained in:
psychobunny
2014-04-14 17:36:10 -04:00
107 changed files with 485 additions and 466 deletions

View File

@@ -275,4 +275,4 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
};
return module;
});
});