Roland Häder b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop ...

Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php

2016-12-20 15:44:31 +01:00

21 KiB

Raw Blame History

View Raw