| commit | 1e9b15eb5d4ebfd5175bc680bb3b70a2ac691081 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Thu Mar 01 19:28:36 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Thu Mar 01 19:28:36 2012 +0530 |
| tree | 1bf92b3508782046ff3bdc1d517c3f1a884048ee | |
| parent | e306a1f5e1c44701ae9416f4e817a639676fe419 [diff] [blame] | |
| parent | 06292433a6fa0e7c0e94673a28495aaf90fafab4 [diff] [blame] |
Merge branch 'master' of github.com:webnotes/erpnext Conflicts: version.num
diff --git a/version.num b/version.num index 35d2965..7ab878c 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -791 \ No newline at end of file +814