Skip to content
Snippets Groups Projects
Commit f79975cb authored by Sean Madsen's avatar Sean Madsen
Browse files

Merge branch 'master' of github.com:civicrm/civicrm-dev-docs into content-standards 

Conflicts:
	mkdocs.yml
parents 30fce84b 0c6ce37b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1207 additions and 51 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment