Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
diff --git a/build.json b/build.json
index 0040b66..4d7fc0d 100644
--- 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",
diff --git a/js/all-app.js b/js/all-app.js
index 92b7cb8..826b6e0 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/version.num b/version.num
index 97964b3..8d73f93 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-422
\ No newline at end of file
+422