commit | 552093c3fd2b1504332b00badc76542ddbb045fe | [log] [tgz] |
---|---|---|
author | Anand Doshi <anand@iwebnotes.com> | Thu Mar 01 13:51:23 2012 +0530 |
committer | Anand Doshi <anand@iwebnotes.com> | Thu Mar 01 13:51:23 2012 +0530 |
tree | ddceda54c3b88ddcb184f4e1ea8a592ca62a8c36 | |
parent | 1f4efc77ac46c1663015c07b211e83b0315c87bf [diff] [blame] | |
parent | b6023a4d3428c66b937d78323d97958ea29bc5cc [diff] [blame] |
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate Conflicts: version.num
diff --git a/version.num b/version.num index 83249da..3aedf24e 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -784 \ No newline at end of file +784