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/uploaders-sid | |
| parent | f6bbb8ff44e6c56bba34efd8b053ae47114ee4bc (diff) | |
| parent | 2060c2fd7aae1e377a9d0fcb7da02da64e4f8da5 (diff) | |
Merge remote branch 'intrigeri/master' into dev
Diffstat (limited to 'files/uploaders-sid')
| -rw-r--r-- | files/uploaders-sid | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/files/uploaders-sid b/files/uploaders-sid index 48d4a65..825694a 100644 --- a/files/uploaders-sid +++ b/files/uploaders-sid @@ -1,2 +1,4 @@ +# This file is managed by Puppet. Do not edit, any changes will be overwritten! + allow * by key 7B75921E allow * by key 6C914A46 |