projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ed8c595
e97d908
)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
author
Simon L'nu
<simon.lnu@gmail.com>
Sun, 1 Apr 2012 07:54:58 +0000
(
03:54
-0400)
committer
Simon 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
projects / friendica.git / commitdiff