diff options
author | Ruben Pollan <meskio@sindominio.net> | 2014-09-19 12:03:05 -0500 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2014-09-19 12:03:05 -0500 |
commit | db044d01432e8c78fcd266308aec0edbee990ab3 (patch) | |
tree | c0936ac6bcbf72924d56169418c080796be50a44 /data/resources | |
parent | 0b3b0031a0271c2e49c9f19b6ff4b74e0de084d6 (diff) | |
parent | 8cd1fb9221fda7d8a516cf5accaac36ef2a9f656 (diff) |
Merge branch 'kali/bug/bump-bm-root-version' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions