Merge branch 'master' of github.com:fetsite/fetsite

Conflicts: app/views/galleries/index.html.erb
2013-08-27 21:27:05 +02:00
parent 8275313836 49af655f62
commit 918a3c9360
14 changed files with 185 additions and 66 deletions
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -12,6 +12,7 @@
 *= require_tree .
 *= require jquery.fileupload-ui
 * require 'bootstrap'
+
 
 */
 $linkColor: #03006E;
@@ -55,4 +56,4 @@ border-style: solid;
 border-width: 1px 0px 0px 0px;
 border-color: grey;
 min-width: 100%;
-}
+}