Merge branch 'develop'
Showing
- .travis.yml 6 additions, 1 deletion.travis.yml
- frappe/__version__.py 1 addition, 1 deletionfrappe/__version__.py
- frappe/core/doctype/doctype/doctype.py 2 additions, 2 deletionsfrappe/core/doctype/doctype/doctype.py
- frappe/hooks.py 1 addition, 1 deletionfrappe/hooks.py
- frappe/model/db_schema.py 25 additions, 8 deletionsfrappe/model/db_schema.py
- frappe/public/js/frappe/views/calendar.js 2 additions, 2 deletionsfrappe/public/js/frappe/views/calendar.js
- frappe/public/js/frappe/views/module/moduleview.js 17 additions, 14 deletionsfrappe/public/js/frappe/views/module/moduleview.js
- frappe/tests/test_client_login.py 0 additions, 11 deletionsfrappe/tests/test_client_login.py
- frappe/tests/test_scheduler.py 10 additions, 6 deletionsfrappe/tests/test_scheduler.py
- frappe/utils/sel.py 24 additions, 5 deletionsfrappe/utils/sel.py
- setup.py 1 addition, 1 deletionsetup.py
- test_sites/test_site/site_config.json 2 additions, 1 deletiontest_sites/test_site/site_config.json
Loading
Please register or sign in to comment