summaryrefslogtreecommitdiff
path: root/tools/mergedirs
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2016-04-07 09:58:31 +0200
committerJan Moskyto Matejka <mq@ucw.cz>2016-04-07 09:58:31 +0200
commit0c8c8151fc1fb0dbfcd682153f50192ea1369884 (patch)
tree90527df8068d1bbc71c29ed87a1cc8e1dce9f8c0 /tools/mergedirs
parenta815d62d5902fb84c28c77726dbe94fc7528bf36 (diff)
parent1a7daab126471374841e41de7f7e590ab22f35c8 (diff)
Merge branch 'int-new-channels' of gitlab.labs.nic.cz:labs/bird into int-new-channels
Diffstat (limited to 'tools/mergedirs')
0 files changed, 0 insertions, 0 deletions