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

derp conflicts

Browse Source 
Merge branch 'master' of https://github.com/psychobunny/NodeBB

Conflicts:
	public/src/templates.js
This commit is contained in:
psychobunny
2013-05-17 15:26:46 -04:00
parent fb52dfc6c8 78b59432cc
commit cb6d98cecb
16 changed files with 191 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/webserver.js
View File

@@ -237,8 +237,8 @@ var express = require('express'),
app.get('/api/:method/:id*', api_method);
app.get('/test', function(req, res) {
topics.get_teasers([1, 2, 3], function(teasers) {
res.send(JSON.stringify(teasers));
topics.get_topic(3, 1, function(data) {
res.send(JSON.stringify(data));
});
});