summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-04-01 00:09:02 -0700
committerelijah <elijah@riseup.net>2013-04-01 00:09:02 -0700
commit88fa87e5a1b524c6a5e840cda6750c5e7df80275 (patch)
tree42fb5db98a48170fcc5858635ed0b6b9f037933a
parent3c41a81f1a3e1757ea6b9bda7e1a98dce624ec1d (diff)
parente6b981902c2b20eed9a0f3d279df7be9405745b0 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
m---------puppet/modules/couchdb0
1 files changed, 0 insertions, 0 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject a4809d6b0627431f72de916abee1214418c01c9
+Subproject 66d918ddb6454fd4a30baed9b49baad98e27424