Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frappe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f1fa8819

Unverified Commit f1fa8819 authored 6 years ago by Ameya Shenoy

Downloads
- Plain Diff

Merge branch 'hotfix'

parents 087562fc 06d2e36a

No related branches found

Tags v10.1.49

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

frappe/__init__.py 1 addition, 1 deletion

frappe/__init__.py
frappe/core/doctype/data_import/data_import.js 3 additions, 0 deletions

frappe/core/doctype/data_import/data_import.js
frappe/core/doctype/report/report.py 17 additions, 2 deletions

frappe/core/doctype/report/report.py
frappe/email/doctype/email_alert/email_alert.py 4 additions, 3 deletions

frappe/email/doctype/email_alert/email_alert.py
frappe/email/queue.py 7 additions, 0 deletions

frappe/email/queue.py
frappe/public/js/frappe/ui/base_list.js 1 addition, 0 deletions

frappe/public/js/frappe/ui/base_list.js

with 33 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment