]> gitweb.fluxo.info Git - lorea/saravea_theme.git/commitdiff
Merge branch 'master' of gitorious.org:lorea/n1_theme into call4desing
authorfoockinho <foockinho@lorea.org>
Tue, 9 Oct 2012 16:41:45 +0000 (18:41 +0200)
committerfoockinho <foockinho@lorea.org>
Tue, 9 Oct 2012 16:41:45 +0000 (18:41 +0200)
Conflicts:
views/default/css/elements/icons.php
views/default/css/elements/layout.php
views/default/css/elements/navigation.php

1  2 
views/default/css/elements/icons.php

Simple merge