]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'origin/BaseObject-#3878' into BaseObject-#3878
authorAdam Magness <adam.magness@gmail.com>
Thu, 16 Nov 2017 21:39:59 +0000 (16:39 -0500)
committerAdam Magness <adam.magness@gmail.com>
Thu, 16 Nov 2017 21:39:59 +0000 (16:39 -0500)

Trivial merge