OSDN Git Service

fix: conflict
authoryasushiito <yas@pen-chan.jp>
Mon, 3 Aug 2015 23:06:00 +0000 (08:06 +0900)
committeryasushiito <yas@pen-chan.jp>
Mon, 3 Aug 2015 23:06:00 +0000 (08:06 +0900)
commitaface4aab08729b68bbf8275a14f4915e4b803b6
treee4ad4cf1b956aff0daca269c568212fa832e70e5
parent6d4de2e0ee79c069c9348603900cce91a9743f23
fix: conflict
app/models/picture.rb