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

merged master fixed conflicts

Browse Source
This commit is contained in:
Baris Usakli
2013-12-05 12:17:01 -05:00
parent 2dd295118c fe4aee177d
commit c096656eff
16 changed files with 407 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/meta.js
View File

@@ -201,9 +201,10 @@ var fs = require('fs'),
'vendor/jquery/js/jquery.timeago.js',
'vendor/jquery/js/jquery.form.js',
'vendor/bootstrap/js/bootstrap.min.js',
'src/app.js',
'vendor/requirejs/require.js',
'vendor/bootbox/bootbox.min.js',
'vendor/tinycon/tinycon.js',
'src/app.js',
'src/templates.js',
'src/ajaxify.js',
'src/translator.js',