summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2016-03-22 13:23:55 +0100
committerJan Moskyto Matejka <mq@ucw.cz>2016-03-22 13:23:55 +0100
commit62a4ad365760afae485ae61c5aab734012545be4 (patch)
tree27efb987179b288db13aada9a41228c3e3de4079 /conf
parent9036bbf2b7cc781c87f2a6b3979198f77ec6ada1 (diff)
parent9c92f69272de3795f7289969e815d99a93d0d9b3 (diff)
Merge remote-tracking branch 'origin/poll'
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions