projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74b237d
1b6c84d
)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
author
Simon L'nu
<simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000
(
00:24
-0400)
committer
Simon L'nu
<simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000
(
00:24
-0400)
* remotes/upstream/master:
diabook-themes: some css/bug-fixes
messages.po/strings.php at 100% Esperanto
Typo
* master:
Trivial merge