diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 12:07:47 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 12:07:47 -0500 |
| commit | d5452d0fa6c843d541c2038f76c6b33a8c96ab4f (patch) | |
| tree | 7c80fc503d4341ff33a0ea245d5f249cf6d14597 /0645d5877476c06b54eacbf15fda5731cf8339ec | |
| parent | 6f161c00ab94d7214e740630236bd85abb994312 (diff) | |
| parent | 83ed43c4a77f38bd9044d6e34724ddb75bba4e5b (diff) | |
Merge branch 'add_customizable_index' into leap
Conflicts:
manifests/repository.pp
Diffstat (limited to '0645d5877476c06b54eacbf15fda5731cf8339ec')
0 files changed, 0 insertions, 0 deletions