]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 1 Apr 2012 07:54:58 +0000 (03:54 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 1 Apr 2012 07:54:58 +0000 (03:54 -0400)
commitbbd86382a61ac814a84d50a871cd32989b1d73c3
treeb3ce88664fa4b0fb403767673dbfc52a4c52e7b1
parented8c5954a9189569a94e9a519f86ca2c8c88db50
parente97d90820dd03cfbb4599c3fe1551f3d198e5e0c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  line 86: s/Friendika/Friendica/
  fix "between yourself and You" in mail list

* master: