OSDN Git Service

(root) / pettanr / pettanr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8262ae6 f766f31)
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Tue, 28 Jan 2014 08:14:00 +0000 (17:14 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 28 Jan 2014 08:14:00 +0000 (17:14 +0900)
1  2 
lib/manifest/manifest.rb patch | diff1 | diff2 | blob | history

diff --cc lib/manifest/manifest.rb
Simple merge
サーバ側、Railsシステム本体
About OSDN
Find Software
Develop Software
Help