]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
authorMichael <heluecht@pirati.ca>
Sat, 20 May 2017 20:08:24 +0000 (20:08 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 20 May 2017 20:08:24 +0000 (20:08 +0000)
1  2 
doc/htconfig.md

diff --cc doc/htconfig.md
Simple merge