]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21d1dc4 fb33b4f)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 29 Feb 2012 11:56:59 +0000 (06:56 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 29 Feb 2012 11:56:59 +0000 (06:56 -0500)
* remotes/upstream/master:
  Update LICENSE
  Update README
  cleaned up mess created when both people request friendship and one approves as duplex
  call time pass by reference deprecated
  From Tobias H - catch some irregularities caused by cut/paste code

* master:


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