Commit 89f10181 authored by Sean Madsen's avatar Sean Madsen

Merge branch 'master' into categories

parents 288a1454 6bea8e5b
......@@ -6,8 +6,9 @@ langs:
en:
repo: 'https://github.com/civicrm/civicrm-user-guide'
latest: master
stable: 4.7
stable: master
history:
- 4.7
- 4.6
ca:
repo: 'https://github.com/babu-cat/civicrm-user-guide-ca'
......
Markdown is supported
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