diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2013-01-07 16:03:01 -0500 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@koumbit.org> | 2013-01-07 16:03:01 -0500 |
| commit | bce5cfbcd446477eb56f365035e86ecacdac6c6c (patch) | |
| tree | 661474a38b3b86068a11523ac1a494f3fbe46704 /files/incoming | |
| parent | f6bbb8ff44e6c56bba34efd8b053ae47114ee4bc (diff) | |
| parent | 2060c2fd7aae1e377a9d0fcb7da02da64e4f8da5 (diff) | |
Merge remote branch 'intrigeri/master' into dev
Diffstat (limited to 'files/incoming')
| -rw-r--r-- | files/incoming | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/files/incoming b/files/incoming index 6825981..57c6a5f 100644 --- a/files/incoming +++ b/files/incoming @@ -1,3 +1,5 @@ +# This file is managed by Puppet. Do not edit, any changes will be overwritten! + Name: incoming IncomingDir: incoming TempDir: tmp |