Commit 359a8a31 authored by Sean Madsen's avatar Sean Madsen
Browse files

Merge branch 'master' into refactor-model

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