rgarcia cd2d05e0c5 fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

..

show.html.erb

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00