projects / GitHub / Stricted / SpeedportHybridControl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e30b3f 54802b9)
Merge branch 'ping' into 1.0-pre12
authorStricted <info@stricted.net>
Thu, 12 Jan 2017 04:25:44 +0000 (05:25 +0100)
committerStricted <info@stricted.net>
Thu, 12 Jan 2017 04:25:44 +0000 (05:25 +0100)

Trivial merge