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
..
2016-01-15 18:19:21 +01:00
2016-09-14 06:45:05 +02:00
2015-08-12 15:44:59 +02:00
2015-08-08 17:33:43 +02:00
2016-01-21 13:44:38 +01:00
2016-01-17 15:54:58 +01:00
2016-10-02 15:21:20 -04:00
2015-08-01 21:20:13 +02:00
2015-08-08 17:33:43 +02:00
2013-06-17 04:28:34 -04:00
2015-07-19 13:23:01 +02:00
2015-10-24 19:51:58 +02:00
2015-05-19 01:07:40 +02:00
2014-11-01 22:18:42 +01:00
2014-09-07 10:26:38 +02:00