rgarcia cc3f151914 fixing conflicts

2015-07-27 23:29:32 +02:00

..

_footer.html.erb

Includes footer partial

2015-07-26 23:14:43 +02:00

_header.html.erb

Includes content for header

2015-07-27 21:19:46 +02:00

application.html.erb

refactoring recaptcha

2015-07-27 18:48:30 +02:00