Fix conflicts

2015-08-17 21:08:15 +02:00
parent b51354cffb 5b0cd4a8ba
commit 7e1cd2940d
34 changed files with 17572 additions and 2 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,4 +26,4 @@

    <%= render 'layouts/footer' %>
  </body>
-</html>
+</html>