]> git.mxchange.org Git - friendica.git/commit - view/theme/diabook/js/jquery.ae.image.resize.js
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29a8d2f 29bc27f)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Tue, 13 Dec 2016 08:59:43 +0000 (09:59 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 13 Dec 2016 08:59:43 +0000 (09:59 +0100)
commitd489ba1510a2dcfaa7851d937d3c37a9541544c9
treef989e0407cface143776e9c93e4b303a6f49951etree | snapshot
parent29a8d2f957c5f2a19d9651c093494f88af1d9697commit | diff
parent29bc27fa6a03a2c3ca173b75abeb23e70f35cbc6commit | diff
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
library/langdet/Text/LanguageDetect.php diff1 | diff2 | blob | history
mod/ping.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.