summaryrefslogtreecommitdiff
path: root/puppet/modules/couchdb
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2014-03-31 21:33:28 +0200
committerkwadronaut <kwadronaut@leap.se>2014-03-31 21:33:28 +0200
commit05bc6a8f3c9caadd8cbe262fc90437980bc26969 (patch)
tree59993091bed05f73919b077cd8865e0bad9e4f9a /puppet/modules/couchdb
parentce35a9dc3457f87ebd8f87decfad1a55e7cfa27a (diff)
parent51f320178a58d7a05860cfd8d6129a16cd4ca9d8 (diff)
Merge branch 'feature/static_site' of https://github.com/elijh/leap_platform into elijh-feature/static_site
Conflicts: puppet/modules/site_config/manifests/packages/base.pp
Diffstat (limited to 'puppet/modules/couchdb')
0 files changed, 0 insertions, 0 deletions