| commit | 23d366a0bedfbd47e6c9334de3f49ea48f03f315 | [log] [tgz] |
|---|---|---|
| author | Rushabh Mehta <rmehta@gmail.com> | Mon Mar 05 11:31:04 2012 +0100 |
| committer | Rushabh Mehta <rmehta@gmail.com> | Mon Mar 05 11:31:04 2012 +0100 |
| tree | 36c6c8aba011f6b9e99259ffda4e2eff19c467ad | |
| parent | 2f69c14e365d01bac57bf7897dcee17d503aeb55 [diff] [blame] | |
| parent | d342e2a4f2963e2783939c3caa4c47567b67e8e4 [diff] [blame] |
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate Conflicts: version.num
diff --git a/version.num b/version.num index f08bce7..0b6746c 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -841 \ No newline at end of file +841