projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c33957a
880dda4
)
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
author
Michael Vogel
<icarus@dabo.de>
Tue, 29 Sep 2015 08:35:50 +0000
(10:35 +0200)
committer
Michael Vogel
<icarus@dabo.de>
Tue, 29 Sep 2015 08:35:50 +0000
(10:35 +0200)
1
2
include/nav.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/nav.php
Simple merge
projects / friendica.git / commitdiff