1. fe8db59 Fixed conflict while merging with develop by Nabin Hait · 11 years ago
  2. cb39e08 Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip by Anand Doshi · 11 years ago
  3. 5c6d13a Fixed conflict while merging with develop branch by Nabin Hait · 11 years ago
  4. dc15b4f Fixed conflict while merging with develop brnach by Nabin Hait · 11 years ago
  5. e277172 merge conflict fixed by Akhilesh Darjee · 11 years ago
  6. 57738a0 flat discount replaced to discount amount by Akhilesh Darjee · 11 years ago
  7. 139aa71 Fixed conflict while merging with master by Nabin Hait · 11 years ago
  8. d3f04d7 General ledger path fixed by Nabin Hait · 11 years ago
  9. d203aea [flat discount] flat discount implemented on sales cycle by Akhilesh Darjee · 11 years ago
  10. caa4380 Merge with 3.3.8 by Rushabh Mehta · 11 years ago
  11. 5404778 Merge with 3.3.8 by Rushabh Mehta · 11 years ago
  12. 2b08985 Translations redesigned webnotes/wnframework#351 by Rushabh Mehta · 11 years ago
  13. 6de403f added manifest, hooks and fixed requires webnotes/wnframework#351 by Rushabh Mehta · 11 years ago
  14. 1f84799 install, web serving, session booting webnotes/wnframework#351 by Rushabh Mehta · 11 years ago
  15. afea58b moved modules inside erpnext folder by Rushabh Mehta · 11 years ago