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

f06d2b1a

Commit f06d2b1a authored 5 years ago by Sahil Khan

Downloads
- Plain Diff

Merge branch 'v11-pre-release' into version-11

parents d6cb28f3 33458117

No related branches found

Tags v11.1.67

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

frappe/__init__.py 1 addition, 1 deletion

frappe/__init__.py
frappe/app.py 2 additions, 2 deletions

frappe/app.py
frappe/commands/site.py 6 additions, 4 deletions

frappe/commands/site.py
frappe/core/doctype/user/user.py 1 addition, 1 deletion

frappe/core/doctype/user/user.py
frappe/installer.py 11 additions, 4 deletions

frappe/installer.py
frappe/integrations/doctype/ldap_settings/ldap_settings.py 7 additions, 0 deletions

frappe/integrations/doctype/ldap_settings/ldap_settings.py
frappe/twofactor.py 2 additions, 2 deletions

frappe/twofactor.py
frappe/www/qrcode.py 5 additions, 4 deletions

frappe/www/qrcode.py
requirements.txt 46 additions, 45 deletions

requirements.txt

with 81 additions and 63 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