]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 493d7bc 2d0c56f)
Merge remote-tracking branch 'upstream/develop' into 1610-performance
authorMichael Vogel <ike@pirati.ca>
Thu, 20 Oct 2016 08:44:19 +0000 (08:44 +0000)
committerMichael Vogel <ike@pirati.ca>
Thu, 20 Oct 2016 08:44:19 +0000 (08:44 +0000)
1  2 
include/event.php patch | diff1 | diff2 | blob | history

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