OSDN Git Service

(root) / pettanr / pettanr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 079e4cb cd0243b)
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Thu, 6 Feb 2014 02:02:38 +0000 (11:02 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 6 Feb 2014 02:02:38 +0000 (11:02 +0900)
1  2 
public/manifest.json patch | diff1 | diff2 | blob | history

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