OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c11c49
6ad852a
)
Merge branch 'master' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06heroku
author
yasushiito
<yas@pen-chan.jp>
Mon, 2 Sep 2013 08:36:36 +0000
(17:36 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Mon, 2 Sep 2013 08:36:36 +0000
(17:36 +0900)
1
2
config/environment.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/environment.rb
Simple merge