Merge branch 'develop'

ab811bb1 · Rushabh Mehta · fcc30a98 · dca08285 · ab811bb1 · ab811bb1
Commit ab811bb1 authored 9 years ago by Rushabh Mehta
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 184 additions and 81 deletions
+184 -81
--- a/frappe/docs/current/models/website/website_slideshow_item.html
+++ b/frappe/docs/current/models/website/website_slideshow_item.html
--- a/frappe/docs/current/models/website/website_theme.html
+++ b/frappe/docs/current/models/website/website_theme.html
--- a/frappe/docs/current/models/workflow/index.html
+++ b/frappe/docs/current/models/workflow/index.html
--- a/frappe/docs/current/models/workflow/workflow.html
+++ b/frappe/docs/current/models/workflow/workflow.html
--- a/frappe/docs/current/models/workflow/workflow_action.html
+++ b/frappe/docs/current/models/workflow/workflow_action.html
--- a/frappe/docs/current/models/workflow/workflow_document_state.html
+++ b/frappe/docs/current/models/workflow/workflow_document_state.html
--- a/frappe/docs/current/models/workflow/workflow_state.html
+++ b/frappe/docs/current/models/workflow/workflow_state.html
--- a/frappe/docs/current/models/workflow/workflow_transition.html
+++ b/frappe/docs/current/models/workflow/workflow_transition.html
--- a/frappe/docs/index.html
+++ b/frappe/docs/index.html
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
--- a/frappe/public/less/docs.less
+++ b/frappe/public/less/docs.less
--- a/frappe/templates/autodoc/base_template.html
+++ b/frappe/templates/autodoc/base_template.html
--- a/frappe/templates/autodoc/docs_home.html
+++ b/frappe/templates/autodoc/docs_home.html
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
--- a/frappe/utils/setup_docs.py
+++ b/frappe/utils/setup_docs.py
--- a/setup.py
+++ b/setup.py