diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /modules/commands/os_kill.cpp | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'modules/commands/os_kill.cpp')
0 files changed, 0 insertions, 0 deletions