Merge branch 'shop'

[prawokultury.git] / prawokultury / settings.d / 50-static.py

diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py
index 0346e85..f43274b 100644 (file)
--- a/prawokultury/settings.d/50-static.py
+++ b/prawokultury/settings.d/50-static.py
@@ -28,7 +28,6 @@ PIPELINE_CSS = {
           'css/forms.scss',
           'events/events.scss',
 
           'css/forms.scss',
           'events/events.scss',
 

-          'css/annoy.css',

         ),
         'output_filename': 'compressed/base.css',
     },
         ),
         'output_filename': 'compressed/base.css',
     },


@@ -43,8 +42,8 @@ PIPELINE_JS = {
     'base': {
         'source_filenames': (
             'js/promobox.js',
     'base': {
         'source_filenames': (
             'js/promobox.js',

+            'shop/shop.js',

 
 

-            'js/annoy.js',

         ),
         'output_filename': 'compressed/base.js',
     },
         ),
         'output_filename': 'compressed/base.js',
     },