diff options
| author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
| commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
| tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /manifests/dist_upgrade.pp | |
| parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
| parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'manifests/dist_upgrade.pp')
0 files changed, 0 insertions, 0 deletions