diff options
| author | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:51:43 -0700 |
|---|---|---|
| committer | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:51:43 -0700 |
| commit | b877d1dc1c5f52cc65393c12efa9769094b2cc7f (patch) | |
| tree | d8c758eaa74ae8411ecbf4423a119ad3a990034d /other/bootstrap_daemon/tox-bootstrapd.conf | |
| parent | c8812d4734bc92be34df076accb3a8e416a94d9d (diff) | |
| parent | 2aed4bb75efa39ccf3a38cf525db35f1deffcd23 (diff) | |
Merge branch 'master' of https://github.com/xor2003/toxcore
#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Diffstat (limited to 'other/bootstrap_daemon/tox-bootstrapd.conf')
0 files changed, 0 insertions, 0 deletions