diff options
author | Darrell Anderson <[email protected]> | 2013-04-18 18:30:25 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2013-04-18 18:30:25 -0500 |
commit | 863a7bed10335f0035235fc09dbad683b0edb0fc (patch) | |
tree | d2fd1b420ef789719b31d3e2a47c5b75c84b062a | |
parent | 30301db949fbd5315c7d8c95190f7f17e36d12ba (diff) | |
parent | 9d8b45fc3978aa5b23749541d7b1bafe1af0ad27 (diff) | |
download | kiosktool-863a7bed10335f0035235fc09dbad683b0edb0fc.tar.gz kiosktool-863a7bed10335f0035235fc09dbad683b0edb0fc.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kiosktool
m--------- | admin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 4027b878fb556a51ed29affd578e78aa7099748 +Subproject 307fab5fdad542247fa11a418be0e9635f4b5eb |