]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0784f7 7728256)
Merge remote-tracking branch 'upstream/develop' into 1704-conversation
authorMichael <heluecht@pirati.ca>
Sun, 23 Apr 2017 14:25:35 +0000 (14:25 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 23 Apr 2017 14:25:35 +0000 (14:25 +0000)
1  2 
include/dbstructure.php patch | diff1 | diff2 | blob | history

diff --cc include/dbstructure.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.