Merge branch 'master' of github.com:lizardsystem/lizard-ui

lizardsystem · May 16, 2012 · 8c4b30d · 8c4b30d
2 parents d5f2c5c + b048322
commit 8c4b30d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,8 @@ Changelog of lizard-ui
   package manager npm installed to install lessc and uglify-js (only needed if
   you need to rebuild twitter-bootstrap).
 
+- Changed icon padding to accommodate for two columns in Chrome.
+
 
 3.16 (2012-05-10)
 -----------------

diff --git a/lizard_ui/migrations/0006_auto__add_field_applicationicon_data_set.py b/lizard_ui/migrations/0006_auto__add_field_applicationicon_data_set.py
@@ -6,6 +6,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("lizard_security", "0002_auto__add_usergroup__add_permissionmapper__add_dataset"),
+        )
+
     def forwards(self, orm):
 
         # Adding field 'ApplicationIcon.data_set'