3 commits

Author	SHA1	Message	Date
Roland Häder	d489ba1510	Merge remote-tracking branch 'upstream/develop' into develop ... Also removed <<<<< as this interfers (a bit) with searching for merge conflicts with a more simplier editor. Signed-off-by: Roland Häder <roland@mxchange.org> Conflicts: mod/ping.php view/lang/fr/messages.po view/lang/fr/strings.php	2016-12-13 09:59:43 +01:00
friendica	891bfd9f91	further jenkins include fixes	2012-11-22 05:09:28 -08:00
friendica	62727012d3	language detection library	2012-05-12 01:55:18 -07:00