OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Sun, 15 Feb 2015 05:01:13 +0000 (14:01 +0900)
committeryasushiito <yas@pen-chan.jp>
Sun, 15 Feb 2015 05:01:13 +0000 (14:01 +0900)
commitcbdaff138774789348a9cb9615034fd9d0344c8e
tree60d2ea58fa6cf6949d3301453130a475ab6d3d24
parente1247bcea50a4ef8ecc11bcab10846589e4c534b
parenteaaa49b6defd70aaef6b9fc6658224bb2d4f522a
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/views/layout.js.coffee
app/assets/javascripts/views/layouts/sns.js.coffee