clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source 
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
This commit is contained in:
Roland Häder
2016-12-13 09:59:43 +01:00
parent 29a8d2f957 29bc27fa6a
commit d489ba1510
1261 changed files with 66596 additions and 191430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/langdet/Text/LanguageDetect.php
View File

@@ -396,7 +396,7 @@ class Text_LanguageDetect
* Returns the list of detectable languages
*
* @access public
* @return array the names of the languages known to this object<<<<<<<
* @return array the names of the languages known to this object
* @throws Text_LanguageDetect_Exception
*/
function getLanguages()