OSDN Git Service

merge miss branch syspic
authoryasushiito <yas@pen-chan.jp>
Tue, 3 Jan 2012 04:01:27 +0000 (13:01 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 3 Jan 2012 04:01:27 +0000 (13:01 +0900)
commit6eb067f6bea470b24457cec5a0819bcfb25a870a
treef53eea8a70cb03dd471ec0e6a92bd41f2108bfef
parent7226de35b568d02b69c24477848902ba8de6ce07
merge miss branch
app/views/speach_balloons/show.html.erb
config/environments/development.rb