| commit | 6e174cc2c4eab37f09add2c49e6eb0b0a26bec01 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Wed Jan 25 17:21:14 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Wed Jan 25 17:21:14 2012 +0530 |
| tree | d9dd4e1473650c418b124c4d92ba3ebf0c7c9454 | |
| parent | 6be842f9606c25495b311c172048ce06c19641cb [diff] [blame] | |
| parent | 46848a48fe3478fa1a1101650189eb894812108c [diff] [blame] |
Merge branch 'master' into latest Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num
diff --git a/version.num b/version.num index 9a13717..fb402ef 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -169 \ No newline at end of file +169