Commit dcd2ad00 authored by nanahira's avatar nanahira

Merge branch '2pick' of github.com:moecube/windbot into 2pick

parents 0b2b84b5 1d715c3f
......@@ -6,4 +6,4 @@
"dialog": "default"
}
]
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment