Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +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

1
public/src/templates.js
View File

@@ -153,6 +153,7 @@
document.getElementById('content').innerHTML = templates[tpl_url].parse(JSON.parse(template_data));
if (callback) callback(true);
}
}