]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69a3f66 95679c4)
Merge remote-tracking branch 'upstream/develop' into new-dba
authorMichael <heluecht@pirati.ca>
Wed, 9 Aug 2017 21:42:51 +0000 (21:42 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 9 Aug 2017 21:42:51 +0000 (21:42 +0000)
1  2 
include/dba.php patch | diff1 | diff2 | blob | history

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