Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:33:00 +01:00
..
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 10:12:31 +01:00
2016-12-21 09:30:49 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:32:00 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 11:38:28 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 21:32:00 +01:00
2016-12-20 21:32:00 +01:00
2016-12-20 12:38:23 +01:00
2016-12-20 21:17:09 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 10:12:31 +01:00
2016-12-20 10:12:31 +01:00
2016-07-09 20:09:09 +02:00
2016-12-01 20:53:18 +00:00
2016-12-20 21:32:00 +01:00