Merge edb0889 into cfae4b0

liqd · Feb 28, 2019 · 2d7c513 · 2d7c513
2 parents cfae4b0 + edb0889
commit 2d7c513
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,6 @@ liqd_product/config/settings/local.py
 
 # Generated static files
 liqd_product/static/
-static/
 
 # Media
 media/

diff --git a/liqd_product/apps/contrib/static/category_icons/icons/default_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/default_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/diamant_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/diamant_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/dreieck_oben_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/dreieck_oben_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/dreieck_unten_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/dreieck_unten_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/ellipse_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/ellipse_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/halbkreis_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/halbkreis_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/hexagon_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/hexagon_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/parallelogramm_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/parallelogramm_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/pentagramm_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/pentagramm_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/quadrat_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/quadrat_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/raute_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/raute_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/rechtecke_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/rechtecke_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/ring_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/ring_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/rw_dreieck_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/rw_dreieck_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/icons/zickzack_icon.svg b/liqd_product/apps/contrib/static/category_icons/icons/zickzack_icon.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/default_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/default_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/diamant_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/diamant_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/dreieck_oben_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/dreieck_oben_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/dreieck_unten_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/dreieck_unten_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/ellipse_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/ellipse_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/halbkreis_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/halbkreis_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/hexagon_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/hexagon_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/parallelogramm_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/parallelogramm_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/pentagramm_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/pentagramm_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/quadrat_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/quadrat_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/raute_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/raute_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/rechtecke_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/rechtecke_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/ring_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/ring_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/rw_dreieck_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/rw_dreieck_pin.svg
diff --git a/liqd_product/apps/contrib/static/category_icons/pins/zickzack_pin.svg b/liqd_product/apps/contrib/static/category_icons/pins/zickzack_pin.svg