1. 5c6d13a Fixed conflict while merging with develop branch by Nabin Hait · 11 years ago
  2. dc15b4f Fixed conflict while merging with develop brnach by Nabin Hait · 11 years ago
  3. 57738a0 flat discount replaced to discount amount by Akhilesh Darjee · 11 years ago
  4. d203aea [flat discount] flat discount implemented on sales cycle by Akhilesh Darjee · 11 years ago
  5. 8e332ff Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions by Anand Doshi · 11 years ago
  6. 5404778 Merge with 3.3.8 by Rushabh Mehta · 11 years ago
  7. 2b08985 Translations redesigned webnotes/wnframework#351 by Rushabh Mehta · 11 years ago
  8. 1f84799 install, web serving, session booting webnotes/wnframework#351 by Rushabh Mehta · 11 years ago
  9. afea58b moved modules inside erpnext folder by Rushabh Mehta · 11 years ago