]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into nightly
authorvinzv <vinz@vinzv.de>
Fri, 2 Sep 2016 09:26:57 +0000 (11:26 +0200)
committervinzv <vinz@vinzv.de>
Fri, 2 Sep 2016 09:26:57 +0000 (11:26 +0200)
commit19df5c9b5049202812fe0f5713e295b597e067d4
tree5e25b92815c261076b80e2581ec5e17a8cd43fb6
parent160df2f2d1304b4656e269fc985ff080b1aa2576
parent18670c69b27e499b2d84efd48185624d223027b9
Merge remote-tracking branch 'upstream/master' into nightly

Conflicts:
lib/util.php
actions/apisearchatom.php
classes/Notice.php
extlib/DB.php
lib/activityhandlerplugin.php
lib/noticelistitem.php
lib/util.php