]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81c8788 7fb4b1b)
Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced
authorMichael <heluecht@pirati.ca>
Tue, 6 Jun 2017 17:30:40 +0000 (17:30 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 6 Jun 2017 17:30:40 +0000 (17:30 +0000)
1  2 
doc/htconfig.md patch | diff1 | diff2 | blob | history

diff --cc doc/htconfig.md
Simple merge
Unnamed repository; edit this file 'description' to name the repository.