| commit | 37fb9c8f275dc5a6c3e60ed2e5b15c33648ef650 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Thu Mar 29 15:35:08 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Thu Mar 29 15:35:08 2012 +0530 |
| tree | 31352203c2bc6ad0249ef3a5544b0e39f2ee7209 | |
| parent | 7ff696fb12b2a9647c6ce42758900fbf8cfa672a [diff] [blame] | |
| parent | 0442b4e2072bf467f5faaaac973436b00e6100ea [diff] [blame] |
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename Conflicts: version.num
diff --git a/version.num b/version.num index 2800f1b..3591ec6 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -1460 +1492