mirror of
https://github.com/friendica/friendica
synced 2024-10-12 22:04:33 +02:00
Roland Häder
d489ba1510
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 |
||
---|---|---|
.. | ||
data | ||
docs | ||
tests | ||
Text |