summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-26 09:48:32 -0800
committerelijah <elijah@riseup.net>2016-02-26 09:48:32 -0800
commitb3d104421aa512cd0fed72eb6e5e7387a620e6ac (patch)
treed3a425a80d8f832778aedddea61f31b4b72dca18 /puppet
parentbfca1b32e33ccd0f5130bae546148529a3642cc3 (diff)
parentc161ce8236386bfcb5c86b62e3a1fc6bd9c0cd1b (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet')
m---------puppet/modules/apache0
m---------puppet/modules/apt0
2 files changed, 0 insertions, 0 deletions
diff --git a/puppet/modules/apache b/puppet/modules/apache
-Subproject 41815f55ec7187a75aec4717c78270593f9776d
+Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject d997142b0cb55b23ed85ee32bbbb72d4456465d
+Subproject 33c61e8df59db1abbed379a9e9790946060a8f1