summaryrefslogtreecommitdiff
path: root/server/.gitattributes
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-10-28 19:25:10 -0200
committerKali Kaneko <kali@leap.se>2013-10-28 19:25:10 -0200
commit7f8ef3746bc4031c5d277420b64e954796331182 (patch)
tree2cbd68e51bf7a6db4de38bc00067b4e2e74d081c /server/.gitattributes
parentf6873fa53593a5fa04e733fc8f4cfbeafc4fb1ee (diff)
parent1244f691b084b12463f88e5e0ba068432c17f621 (diff)
Merge remote-tracking branch 'drebs-github/feature/4097_allow-for-locking-creation-of-secrets-in-server' into develop
Diffstat (limited to 'server/.gitattributes')
0 files changed, 0 insertions, 0 deletions