]> gitweb.fluxo.info Git - lorea/saravea_theme.git/commit
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)
commited24dcbb532d107bf763f3b6bf9e68b99bc0518a
treed5cbe4dd941435f499d1f8ad12acda97da954fe9
parent9f9009acca4e28b0ce6610ad01131a592796cb42
parent1f4efa65be0b1b61c6c42d49a9c663c0ee536521
Merge branch 'master' of gitorious.org:lorea/n1_theme into call4desing

Conflicts:
views/default/css/elements/icons.php
views/default/css/elements/layout.php
views/default/css/elements/navigation.php
views/default/css/elements/icons.php