diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
| commit | 9de1086c937c5f8919cb279e7f601d7de064f901 (patch) | |
| tree | 83362fdb6ee6bfb17bc8aa1477cb5c06f54022ca /doc/development | |
| parent | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (diff) | |
| parent | 521862b6584eb4d68e12df5d1a5c4f7a8ef1bdf5 (diff) | |
| download | bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.gz bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.bz2 bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/installation/distributions.txt
doc/server/snapshots/index.txt
src/lib/Bcfg2/Server/Plugin/helpers.py
src/sbin/bcfg2-server
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/plugins.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/plugins.txt b/doc/development/plugins.txt index 3ca137159..e4f16b84d 100644 --- a/doc/development/plugins.txt +++ b/doc/development/plugins.txt @@ -215,4 +215,4 @@ See Also -------- * :ref:`development-compat` -* :ref:`development-utils +* :ref:`development-utils` |