summaryrefslogtreecommitdiff
path: root/templates/irc_bot/nsa.cfg.erb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-07-14 17:55:33 -0400
committerMicah Anderson <micah@riseup.net>2011-07-14 17:55:33 -0400
commit6ad1e288af0f8b6691aa6b57b2b23c44b06d4165 (patch)
tree3a127ba89ab98012ffc154380978389eedf3b2fd /templates/irc_bot/nsa.cfg.erb
parentb0ca021364957715bb608d25ad47baed568f078a (diff)
parentdb9b47560068218125cfb82b0a19a491cffba002 (diff)
Merge remote-tracking branch 'remotes/lelutin/bot_fixes'
Conflicts: manifests/irc_bot.pp Had to merge in the use_notices change that we had in our branch
Diffstat (limited to 'templates/irc_bot/nsa.cfg.erb')
0 files changed, 0 insertions, 0 deletions