projects
/
platal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe6080a
2d7ad72
)
Merge branch 'xorg/maint' into xorg/master
author
Stéphane Jacob
<sj@m4x.org>
Mon, 24 Oct 2011 22:26:25 +0000
(
00:26
+0200)
committer
Stéphane Jacob
<sj@m4x.org>
Mon, 24 Oct 2011 22:26:25 +0000
(
00:26
+0200)
1
2
modules/profile.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/profile.php
Simple merge