diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-04-16 12:17:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-04-16 12:17:27 -0300 |
| commit | d468718cdba4c8ac4bad5141e71cd4357072ec9a (patch) | |
| tree | 6b223d264b28de2f1f67f8790c66e4668e9bf10f /libre/webmin | |
| parent | 81f86bc4de7ecaae19f82960c34fe225e13a06f7 (diff) | |
| parent | e6ae96ab0320ff1ea91b78dd2c1d5ed337107a31 (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to 'libre/webmin')
0 files changed, 0 insertions, 0 deletions