Merge branch 'latest' of github.com:webnotes/erpnext into latest

Conflicts: version.num
2012-02-14 12:46:44 +05:30 · 2012-02-14 12:46:44 +05:30 · 04d47aae6f
commit 04d47aae6f
parent b2be11cad1 05f4c290ec
3 changed files with 5 additions and 1 deletions
--- a/build.json
+++ b/build.json
@ -113,6 +113,7 @@
 			"lib/js/lib/jquery.min.js:concat",
 			"lib/js/lib/history/history.min.js:concat",
 			"lib/js/legacy/jquery/jquery-ui.min.js:concat",
+			"lib/js/legacy/tiny_mce_33/jquery.tinymce.js:concat",
 			"lib/js/core.min.js:concat",
 			"lib/js/legacy/globals.js",
 			"lib/js/legacy/utils/datatype.js",
--- a/js/all-app.js
+++ b/js/all-app.js
--- a/version.num
+++ b/version.num
@ -1 +1 @@
-422
+422