https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
686fe47
d50a839
)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
author
Simon L'nu
<simon.lnu@gmail.com>
Sat, 10 Mar 2012 05:15:29 +0000
(
00:15
-0500)
committer
Simon L'nu
<simon.lnu@gmail.com>
Sat, 10 Mar 2012 05:15:29 +0000
(
00:15
-0500)
* remotes/upstream/master:
spec directory
allow user to set number of items to show on network page
revup
* master:
Trivial merge