aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-03-17 15:24:46 +0000
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-03-17 15:24:46 +0000
commita9e4f0b5a75796c56c5cfedc8c0bffc0c386e3bc (patch)
tree37611e2ca83b20f594ea2d3cbf1316c91437c738 /LICENSE
parent21d8dc8652a9e8910914940cc439e7a02efbf39e (diff)
parentb2c9640c654b0d9ba2f5949ef53480c855a6d1f0 (diff)
downloadpuppet-backupninja-a9e4f0b5a75796c56c5cfedc8c0bffc0c386e3bc.tar.gz
puppet-backupninja-a9e4f0b5a75796c56c5cfedc8c0bffc0c386e3bc.tar.bz2
Merge branch 'merge_mayfirst' into 'master'
Merge mayfirst (almost) Last branch that needs to be merged in. This work is 3 years old See merge request !1
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions