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
..
Text	Merge remote-tracking branch 'upstream/develop' into develop	2016-12-13 09:59:43 +01:00
data	…
docs	…
tests	…