Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery

Conflicts: app/views/layouts/application.html.erb
2015-01-15 15:40:36 +01:00
parent 565024c282 48e3c1149a
commit 43a551fc28
56 changed files with 1154 additions and 125 deletions
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -1,3 +1,6 @@
+
+@import 'blueimp-gallery-all';
+
 h1 { 
  font-size: 23px
 }