summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2015-05-25 16:05:46 (EDT)
committer P. J. McDermott <pj@pehjota.net>2015-05-25 16:05:46 (EDT)
commitfe27982ac6e0bec91c9a9762b689018e50e47238 (patch)
treeef6e69dc411e56290e8fe32b075dcfee0bfc7f0a /tests
parent54eacca88673a1444f40cb049813d5cc8475f02c (diff)
parent50b6588d6350c7b15ffbcf5e0e704461861a8870 (diff)
Merge branch 'feature/block-device-mounting' into feature/installer-integration
Conflicts: locale/en_US.sh
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions