life bd59846b0a Merge branch 'feature-batch' into pre-release ...

Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js

2015-10-26 23:16:32 +08:00

..

app

Merge branch 'feature-batch' into pre-release

2015-10-26 23:16:32 +08:00

dec

move src/* to /

2015-09-24 13:13:57 +08:00

google-code-prettify

move src/* to /

2015-09-24 13:13:57 +08:00

bootstrap_updates.txt

move src/* to /

2015-09-24 13:13:57 +08:00

bootstrap-min.js

move src/* to /

2015-09-24 13:13:57 +08:00

bootstrap.js

move src/* to /

2015-09-24 13:13:57 +08:00

common.js

Merge branch 'feature-batch' into pre-release

2015-10-26 23:16:32 +08:00

jquery-1.9.0.min.js

move src/* to /

2015-09-24 13:13:57 +08:00

jquery.ztree.all-3.5.js

move src/* to /

2015-09-24 13:13:57 +08:00

jsrender.js

move src/* to /

2015-09-24 13:13:57 +08:00

lang.js

replace with electron

2015-09-24 13:22:59 +08:00

main.js

replace with electron

2015-09-24 13:22:59 +08:00

object_id.js

move src/* to /

2015-09-24 13:13:57 +08:00

require.js

move src/* to /

2015-09-24 13:13:57 +08:00