Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source 
Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js
This commit is contained in:
psychobunny
2014-03-09 16:07:34 -04:00
parent e84dd4fd94 281c482f1c
commit 1ef95bd09e
19 changed files with 460 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/webserver.js
View File

@@ -95,4 +95,5 @@ if(nconf.get('ssl')) {
winston.info('NodeBB Ready');
});
};
}(WebServer));