git.mxchange.org Git - friendica.git/commit - mod/register.php

]> git.mxchange.org Git - friendica.git/commit - mod/register.php

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e9c9c47 de5a0da)

author	Roland Häder <roland@mxchange.org>
	Tue, 13 Jun 2017 21:26:06 +0000 (23:26 +0200)
committer	Roland Häder <roland@mxchange.org>
	Tue, 13 Jun 2017 21:26:06 +0000 (23:26 +0200)
commit	4e49939421d39dfa971d8744691568bcdbdca15e
tree	a5417268f1579fbae04e360f4bdeb1b6cfbd4e75	tree \| snapshot
parent	e9c9c47a84c671ecf2bb4cf98efb3728e1f1fb5d	commit \| diff
parent	de5a0dadb0715198b9ba376e4ab79f58cedef098	commit \| diff

Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2

Signed-off-by: Roland Häder <roland@mxchange.org>

13 files changed:

doc/de/Account-Basics.md	diff1 \|	diff2 \|	blob \| history
include/dba_pdo.php	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	diff1 \|	diff2 \|	blob \| history
include/diaspora.php	diff1 \|	diff2 \|	blob \| history
include/msgclean.php	diff1 \|	diff2 \|	blob \| history
include/queue.php	diff1 \|	diff2 \|	blob \| history
include/socgraph.php	diff1 \|	diff2 \|	blob \| history
include/tags.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
include/threads.php	diff1 \|	diff2 \|	blob \| history
mods/sample-nginx.config	diff1 \|	diff2 \|	blob \| history
view/lang/en-gb/messages.po	\|	diff2 \|	blob \| history
view/lang/en-us/messages.po	\|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.