OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Mon, 11 Aug 2014 08:38:17 +0000 (17:38 +0900)
committeryasushiito <yas@pen-chan.jp>
Mon, 11 Aug 2014 08:38:17 +0000 (17:38 +0900)
commitebb950487db886437783df10ffccc48074488f1a
treeaa6b000f72bc33d5a4950d083fdce6dd108735b8
parent4c06cc2cd9eae13117c47fb5ed81e68636b0b4ae
parentaa2a215992f9a5d2d7e8d21eba3f1fd09ea50f70
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/work/controllers.js.coffee.erb
public/manifest.json