Merge branch 'testgallery'

2015-01-17 12:18:14 +01:00
parent edc8f6c2e3 3c2250b4fc
commit e93b9b7342
21 changed files with 265 additions and 164 deletions
--- a/app/assets/stylesheets/themes/blue1/application.css.scss
+++ b/app/assets/stylesheets/themes/blue1/application.css.scss
@@ -11,11 +11,11 @@
 *
 *= require_self
 * require_tree .
+ *= require blueimp-gallery-all
 *= require jquery.fileupload-ui
 *= require jquery.datetimepicker	
 *= require jquery.ui.dialog
 * require 'bootstrap'
-
 * require 'neuigkeiten'
 */