From: yasushiito <yas@pen-chan.jp>
Date: Mon, 20 Jul 2015 06:04:07 +0000 (+0900)
Subject: Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=2ad2de8db58dac6a0e81f1db91a1a8415b2b9de7

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
---

2ad2de8db58dac6a0e81f1db91a1a8415b2b9de7
diff --cc app/assets/javascripts/yasapp.js
index 66d9c277,8360f564..12877aa2
--- a/app/assets/javascripts/yasapp.js
+++ b/app/assets/javascripts/yasapp.js
@@@ -307,12 -307,8 +307,11 @@@
  //= require_directory ./models
  //= require_directory ./view
  //= require_directory ./view/button
- //= require_directory ./view/image
  //= require_directory ./view/show
 +//= require_directory ./view/show/header
 +//= require_directory ./view/show/footer
  //= require_directory ./view/play
 +//= require_directory ./view/summary
  //= require_directory ./views
  //= require_directory ./views/folders
  //= require_directory ./views/artists