projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a170d83 59ec301)
Merge branch 'master' into stable
authorGeorgia Young <geographic@riseup.net>
Fri, 1 Dec 2017 18:05:17 +0000 (13:05 -0500)
committerGeorgia Young <geographic@riseup.net>
Fri, 1 Dec 2017 18:05:17 +0000 (13:05 -0500)

Trivial merge