]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7537e7 a0a0885)
Merge remote-tracking branch 'upstream/develop' into issue-3326
authorMichael <heluecht@pirati.ca>
Fri, 14 Apr 2017 22:30:48 +0000 (22:30 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 14 Apr 2017 22:30:48 +0000 (22:30 +0000)
1  2 
database.sql patch | diff1 | diff2 | blob | history
include/dbstructure.php patch | diff1 | diff2 | blob | history

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