]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d42cea5 604a630)
Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications
authorMichael Vogel <icarus@dabo.de>
Tue, 21 Apr 2015 08:13:28 +0000 (10:13 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 21 Apr 2015 08:13:28 +0000 (10:13 +0200)
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.