OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1cc9e2
8ab1c39
)
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
author
yasushiito
<yas@pen-chan.jp>
Wed, 7 Aug 2013 10:10:07 +0000
(19:10 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Wed, 7 Aug 2013 10:10:07 +0000
(19:10 +0900)
1
2
app/views/panels/_form.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/views/panels/_form.html.erb
Simple merge