aboutsummaryrefslogtreecommitdiff
path: root/configs/conferences/osc16
diff options
context:
space:
mode:
authorMaZderMind2016-12-20 22:38:46 +0100
committerMaZderMind2016-12-20 22:38:46 +0100
commitfa8efe21fd2142935e8e63bf83fc4839c8ec5065 (patch)
tree751649658a5f703e1817d5dfecabaafd950074d3 /configs/conferences/osc16
parentc8aaa8d04d785c9d9e84c343b4ebb3aaf524d868 (diff)
parent5ec71310d5ed6e1c4879506de7cae65ef1aab922 (diff)
Merge branch 'master' into events/33c3
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions