]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae172a9 81901f3)
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
authorMichael Vogel <icarus@dabo.de>
Mon, 6 Apr 2015 11:30:22 +0000 (13:30 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 6 Apr 2015 11:30:22 +0000 (13:30 +0200)
1  2 
index.php patch | diff1 | diff2 | blob | history

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