diff options
| author | Micah <micah@riseup.net> | 2015-02-28 16:44:30 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-02-28 16:44:30 +0000 |
| commit | bf746f2f9caacd869a252c7f09cde93c0e577e09 (patch) | |
| tree | e7c2d4161b529967079d20ff4f81e5c118cf1a67 /files | |
| parent | ac5da1df281e636ecffe260b681e8119a1057e1d (diff) | |
| parent | c6beeb1718608389e027d287c7a8ddd586313df2 (diff) | |
| download | puppet-common-bf746f2f9caacd869a252c7f09cde93c0e577e09.tar.gz puppet-common-bf746f2f9caacd869a252c7f09cde93c0e577e09.tar.bz2 | |
Merge branch 'master' into 'master'
Merge with immerda
See merge request !1
Diffstat (limited to 'files')
| -rw-r--r-- | files/empty/.ignore | 0 | ||||
| -rw-r--r-- | files/modules/README | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/files/empty/.ignore b/files/empty/.ignore deleted file mode 100644 index e69de29..0000000 --- a/files/empty/.ignore +++ /dev/null diff --git a/files/modules/README b/files/modules/README deleted file mode 100644 index bc5bbbd..0000000 --- a/files/modules/README +++ /dev/null @@ -1 +0,0 @@ -this directory contains various data collected for system wide configurations |