branching: merge stable back into default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 01 Aug 2018 23:52:10 +0200
changeset 3918 66a863bb6401
parent 3908 2af10d0a59e0 (diff)
parent 3917 ca7f02c9fa57 (current diff)
child 3937 544f394997aa
branching: merge stable back into default