summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-06-10 13:54:03 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-06-10 13:54:03 -0500
commit70d618b9dc3a3784e9a84aa242157e1ade102216 (patch)
tree093d25de0edbe5c69534aa7033fc3c40b0cf94ae /.gitignore
parent3d1b2b3a2d549a69e6a997b042020ff113c6f86b (diff)
parent9b36d0bf226e19baf50c45faac601effb8c17090 (diff)
downloadbcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.tar.gz
bcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.tar.bz2
bcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.zip
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: doc/server/plugins/structures/bundler/index.txt src/lib/Bcfg2/Server/Admin/Init.py src/lib/Bcfg2/Server/Plugins/GroupLogic.py src/lib/Bcfg2/Server/Plugins/Properties.py src/lib/Bcfg2/Server/Plugins/Reporting.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions