]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7920c4 5dcce1e)
Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions
authorfriendica <info@friendica.com>
Fri, 6 Jul 2012 01:05:32 +0000 (18:05 -0700)
committerfriendica <info@friendica.com>
Fri, 6 Jul 2012 01:05:32 +0000 (18:05 -0700)
add some timeouts to prevent deadlock


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.