aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorPierre Letouzey2015-06-22 14:53:31 +0200
committerPierre Letouzey2015-06-22 14:53:31 +0200
commit29fcfc4f8bc1bfbdfbae0c07850aed65f6c3eb04 (patch)
tree1e2edfae22c9f90ae4eceb8cf081df88a98b981e /dev
parent6bec099f8487b9d3ec5c44079cf69d3474c73b91 (diff)
parent4b6b4d8cdd12902d166504ec3d96ca94705d81f6 (diff)
Merge branch 'v8.5' into trunk
Diffstat (limited to 'dev')
0 files changed, 0 insertions, 0 deletions