summaryrefslogtreecommitdiffstats
path: root/abs/core/apache/apache.conf.d
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-10-21 21:23:34 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-10-21 21:23:34 (GMT)
commit98a38807ed4d1c68db1225ce78b7b3e828816ade (patch)
tree8f1a9d40d902092a2dd450c0fb451309289a2122 /abs/core/apache/apache.conf.d
parent9eef516e0aeb596daff3c8911055c5a2a8f4e143 (diff)
parent1ba35589c55706d70c7837262da4177586ddf5a6 (diff)
downloadlinhes_pkgbuild-98a38807ed4d1c68db1225ce78b7b3e828816ade.zip
linhes_pkgbuild-98a38807ed4d1c68db1225ce78b7b3e828816ade.tar.gz
linhes_pkgbuild-98a38807ed4d1c68db1225ce78b7b3e828816ade.tar.bz2
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
Conflicts: abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/apache/apache.conf.d')
0 files changed, 0 insertions, 0 deletions