friendica_2021-01/view/theme
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
..
duepuntozero Add active like style to duepuntozero 2016-11-22 16:31:14 +01:00
frio More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
frost Add active response support to frost theme 2016-11-22 18:42:37 +01:00
frost-mobile Added active response support to frost-mobile 2016-11-22 16:31:25 +01:00
quattro Add active response support to quattro theme 2016-11-22 16:31:37 +01:00
smoothly Added response active support to smoothly 2016-11-22 16:31:52 +01:00
vier Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00