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-12-13 10:16:36 +01:00
2016-02-09 11:10:00 +01:00
2016-12-05 22:48:02 -05:00
2016-11-20 17:32:37 +01:00
2016-11-12 17:20:26 +00:00
2016-12-13 10:16:36 +01:00
2015-06-23 16:13:09 +02:00
2016-12-13 10:16:36 +01:00
2016-12-13 10:16:36 +01:00
2016-05-01 13:48:52 +02:00
2016-12-13 10:16:36 +01:00
2016-12-13 10:16:36 +01:00
2016-11-04 19:26:28 +01:00
2015-12-28 10:23:06 +01:00
2015-05-15 20:41:10 +02:00
2016-12-13 10:16:36 +01:00
2016-10-23 22:12:45 +00:00
2016-11-27 23:41:55 +01:00
2016-12-13 10:16:36 +01:00
2016-12-13 10:16:36 +01:00
2016-11-28 22:18:37 +00:00
2016-12-01 21:11:52 +00:00
2016-12-13 10:16:36 +01:00
2016-11-27 20:42:40 +01:00