]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed8c595 e97d908)
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)
* remotes/upstream/master:
  line 86: s/Friendika/Friendica/
  fix "between yourself and You" in mail list

* master:


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