projects / soc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 575802f 8850048)
Merge remote-tracking branch 'origin/master'
authorJacob Lifshay <programmerjake@gmail.com>
Wed, 22 Jul 2020 22:19:40 +0000 (15:19 -0700)
committerJacob Lifshay <programmerjake@gmail.com>
Wed, 22 Jul 2020 22:19:40 +0000 (15:19 -0700)

Trivial merge