rgarcia 95101c4cc8 fixing conflicts [#45]

2015-07-29 13:36:48 +02:00

..

_footer.html.erb

Adds fake footer

2015-07-28 14:07:47 +02:00

_header.html.erb

adds i18n to header

2015-07-28 18:49:41 +02:00

application.html.erb

updates alert styling [#45]

2015-07-28 18:33:09 +02:00